diff --git a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_other_form.html b/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_other_form.html
index f9468f31..1e8201c3 100644
--- a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_other_form.html
+++ b/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_other_form.html
@@ -83,7 +83,7 @@ <h4>Acknowledgment of Terms</h4>
           <div class="field-errors" style="display: none"></div>
 
           <input type="email" name="requestor-email" required class="emailinput" autocomplete="email"
-            id="requestor-email" pattern="^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[a-z]{2,4}$"/>
+            id="requestor-email" pattern="^[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[a-z]{2,4}$"/>
         </div>
       </div>
       <div class="field-wrapper textinput required"><label>
diff --git a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html b/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html
index d0740963..6ff13e31 100644
--- a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html
+++ b/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html
@@ -162,7 +162,7 @@ <h4>Acknowledgment of Terms</h4>
                 <div class="field-errors" style="display: none"></div>
 
                 <input type="email" name="requestor-email" required class="emailinput" autocomplete="email"
-                  id="requestor-email" pattern="^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[a-z]{2,4}$" />
+                  id="requestor-email" pattern="^[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[a-z]{2,4}$" />
               </div>
             </div>
             <div class="field-wrapper textinput required"><label>
diff --git a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html b/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html
index 8f563636..d53b88af 100644
--- a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html
+++ b/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html
@@ -159,7 +159,7 @@ <h4>Acknowledgment of Terms</h4>
                 <div class="field-errors" style="display: none"></div>
 
                 <input type="email" name="requestor-email" required class="emailinput" autocomplete="email"
-                  id="requestor-email" pattern="^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[a-z]{2,4}$" />
+                  id="requestor-email" pattern="^[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[a-z]{2,4}$" />
               </div>
             </div>
 
diff --git a/apcd-cms/src/apps/view_users/templates/view_user_edit_modal.html b/apcd-cms/src/apps/view_users/templates/view_user_edit_modal.html
index b2589eb0..78e2992b 100644
--- a/apcd-cms/src/apps/view_users/templates/view_user_edit_modal.html
+++ b/apcd-cms/src/apps/view_users/templates/view_user_edit_modal.html
@@ -27,8 +27,8 @@ <h4 class="modal-header">Edit Selected User</h4>
                     </label>
         
                       <div class="field-errors" style="display: none"></div>
-                        <textarea name="user_name" cols="40" rows="1" class="textinput" type="text" id="name"
-                          minlength="2" maxlength="200">{{r.user_name}}</textarea>
+                        <input name="user_name" class="textinput" type="text" id="name"
+                          value='{{r.user_name}}' required></textarea>
 
                       </div>
                       <div class="field-wrapper text required">
@@ -37,8 +37,9 @@ <h4 class="modal-header">Edit Selected User</h4>
                         </label>
             
                           <div class="field-errors" style="display: none"></div>
-                            <textarea name="user_email" cols="40" rows="1" class="textinput" type="text" id="email"
-                              minlength="2" maxlength="200">{{r.user_email}}</textarea>
+                            <input name="user_email" class="textinput" type="email" id="email"
+                              pattern="^[A-Za-z0-9._%+\-]+@[A-Za-z0-9.\-]+\.[a-z]{2,4}$" value='{{r.user_email}}' required
+                              >
 
                           </div>