diff --git a/src/views/add-member.html b/src/views/add-member.html
index b9f56f9..7fe86c6 100644
--- a/src/views/add-member.html
+++ b/src/views/add-member.html
@@ -15,46 +15,17 @@ <h1 class="govuk-heading-l">Add a GitHub Member</h1>
 
   <form method="post" novalidate>
 
-    {{ govukInput({
-      errorMessage: errors.first_name if errors,
-      label: {
-        text: "First Name",
-        classes: "govuk-label--m"
-      },
-      classes: "govuk-input--width-20",
-      id: "first_name",
-      name: "first_name",
-      value: first_name
-    }) }}
+    {% set firstNameText = "First name" %}
+    {% include "include/inputs/first-name.html" %}
 
-    {{ govukInput({
-      errorMessage: errors.last_name if errors,
-      label: {
-        text: "Last Name",
-        classes: "govuk-label--m"
-      },
-      classes: "govuk-input--width-20",
-      id: "last_name",
-      name: "last_name",
-      value: last_name
-    }) }}
+    {% set lastNameText = "Last name" %}
+    {% include "include/inputs/last-name.html" %}
 
     {% set githubHandleText = "GitHub Handle" %}
     {% include "include/inputs/github-handle.html" %}
 
-    {{ govukInput({
-      errorMessage: errors.email_address if errors,
-      label: {
-        text: "Email Address",
-        classes: "govuk-label--m"
-      },
-      classes: "govuk-input--width-20",
-      id: "email_address",
-      name: "email_address",
-      value: email_address,
-      type: "email",
-      spellcheck: false
-    }) }}
+    {% set emailAddressText = "Email address" %}
+    {% include "include/inputs/email-address.html" %}
 
     {% set dateHtml %}
       {{ govukInput({
diff --git a/src/views/include/inputs/email-address.html b/src/views/include/inputs/email-address.html
new file mode 100644
index 0000000..e52b063
--- /dev/null
+++ b/src/views/include/inputs/email-address.html
@@ -0,0 +1,13 @@
+{{ govukInput({
+  errorMessage: errors.email_address if errors,
+  label: {
+    text: emailAddressText,
+    classes: "govuk-label--m"
+  },
+  classes: "govuk-input--width-20",
+  id: "email_address",
+  name: "email_address",
+  value: email_address,
+  type: "email",
+  spellcheck: false
+}) }}
\ No newline at end of file
diff --git a/src/views/include/inputs/first-name.html b/src/views/include/inputs/first-name.html
new file mode 100644
index 0000000..c31c7fa
--- /dev/null
+++ b/src/views/include/inputs/first-name.html
@@ -0,0 +1,11 @@
+{{ govukInput({
+  errorMessage: errors.first_name if errors,
+  label: {
+    text: firstNameText,
+    classes: "govuk-label--m"
+  },
+  classes: "govuk-input--width-20",
+  id: "first_name",
+  name: "first_name",
+  value: first_name
+}) }}
\ No newline at end of file
diff --git a/src/views/include/inputs/last-name.html b/src/views/include/inputs/last-name.html
new file mode 100644
index 0000000..a7f72f8
--- /dev/null
+++ b/src/views/include/inputs/last-name.html
@@ -0,0 +1,11 @@
+{{ govukInput({
+  errorMessage: errors.last_name if errors,
+  label: {
+    text: lastNameText,
+    classes: "govuk-label--m"
+  },
+  classes: "govuk-input--width-20",
+  id: "last_name",
+  name: "last_name",
+  value: last_name
+}) }}
\ No newline at end of file