diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php
index 83706d12..77699f51 100644
--- a/client_contact_add_modal.php
+++ b/client_contact_add_modal.php
@@ -18,6 +18,9 @@
             <li class="nav-item">
               <a class="nav-link" data-toggle="pill" href="#pills-photo">Photo</a>
             </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-portal">Portal</a>
+            </li>
             <li class="nav-item">
               <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
             </li>
@@ -139,8 +142,21 @@
                 </div>
               </div>
 
+            </div>
+
+            <div class="tab-pane fade" id="pills-photo">
+              
               <div class="form-group">
-                <label>Portal Login</label>
+                <label>Upload Photo</label>
+                <input type="file" class="form-control-file" name="file">
+              </div>
+
+            </div>
+
+            <div class="tab-pane fade" id="pills-portal"> 
+
+              <div class="form-group">
+                <label>Login</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
@@ -155,15 +171,6 @@
 
             </div>
 
-            <div class="tab-pane fade" id="pills-photo">
-              
-              <div class="form-group">
-                <label>Upload Photo</label>
-                <input type="file" class="form-control-file" name="file">
-              </div>
-
-            </div>
-
             <div class="tab-pane fade" id="pills-notes">
               
               <div class="form-group">
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php
index fc472179..88b7f951 100644
--- a/client_contact_edit_modal.php
+++ b/client_contact_edit_modal.php
@@ -20,6 +20,9 @@
             <li class="nav-item">
               <a class="nav-link" data-toggle="pill" href="#pills-photo<?php echo $contact_id; ?>">Photo</a>
             </li>
+            <li class="nav-item">
+              <a class="nav-link" data-toggle="pill" href="#pills-portal<?php echo $contact_id; ?>">Portal</a>
+            </li>
             <li class="nav-item">
               <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $contact_id; ?>">Notes</a>
             </li>
@@ -141,8 +144,12 @@
                 </div>
               </div>
 
+            </div>
+
+            <div class="tab-pane fade" id="pills-portal<?php echo $contact_id; ?>">
+
               <div class="form-group">
-                <label>Portal Login</label>
+                <label>Login</label>
                 <div class="input-group">
                   <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fa fa-fw fa-user-circle"></i></span>
@@ -158,12 +165,15 @@
               <?php if($auth_method == "local") { ?>
 
                 <div class="form-group">
-                  <label>Portal Login Password</label>
+                  <label>Password</label>
                   <div class="input-group">
                     <div class="input-group-prepend">
                       <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
                     </div>
-                    <input class="form-control" type="password" name="contact_password" placeholder="Leave blank for no change">
+                    <input type="password" class="form-control" data-toggle="password" name="contact_password" placeholder="Leave blank for no change" autocomplete="new-password">
+                    <div class="input-group-append">
+                      <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                    </div>
                   </div>
                 </div>