diff --git a/templates/components/phone_input.html b/templates/components/phone_input.html
index 62a1c18a..74200436 100644
--- a/templates/components/phone_input.html
+++ b/templates/components/phone_input.html
@@ -1,12 +1,12 @@
 {% from "components/text_input.html" import TextInput %}
 
-{% macro PhoneInput(phone_number, phone_ext, placeholder_phone="") %}
+{% macro PhoneInput(phone_number, phone_ext, placeholder_phone="", phone_optional=True, extension_optional=True) %}
   <div class='phone-input'>
       <div class='phone-input__phone'>
-        {{ TextInput(phone_number, placeholder=placeholder_phone, validation='usPhone') }}
+        {{ TextInput(phone_number, placeholder=placeholder_phone, validation='usPhone', optional=phone_optional) }}
       </div>
       <div class='phone-input__extension'>
-        {{ TextInput(phone_ext, validation='phoneExt')}}
+        {{ TextInput(phone_ext, validation='phoneExt', optional=extension_optional) }}
       </div>
   </div>
 {%- endmacro %}
diff --git a/templates/fragments/edit_user_form.html b/templates/fragments/edit_user_form.html
index 56f61b80..473b8d3f 100644
--- a/templates/fragments/edit_user_form.html
+++ b/templates/fragments/edit_user_form.html
@@ -11,16 +11,16 @@
       <div class='panel__content'>
         <div class='form-row'>
           <div class='form-col form-col--half'>
-            {{ TextInput(form.first_name, validation='requiredField') }}
+            {{ TextInput(form.first_name, validation='requiredField', optional=False) }}
           </div>
 
           <div class='form-col form-col--half'>
-            {{ TextInput(form.last_name, validation='requiredField') }}
+            {{ TextInput(form.last_name, validation='requiredField', optional=False) }}
           </div>
         </div>
 
-        {{ TextInput(form.email, validation='email') }}
-        {{ PhoneInput(form.phone_number, form.phone_ext) }}
+        {{ TextInput(form.email, validation='email', optional=False) }}
+        {{ PhoneInput(form.phone_number, form.phone_ext, phone_optional=False) }}
 
         {{ OptionsInput(form.service_branch) }}
         {{ OptionsInput(form.citizenship) }}