diff --git a/client_contact_add_modal.php b/client_contact_add_modal.php
index ff74cace..b7c8cf7c 100644
--- a/client_contact_add_modal.php
+++ b/client_contact_add_modal.php
@@ -184,30 +184,32 @@
                                 </div>
                             </div>
                             <?php if($config_client_portal_enable == 1) { ?>
-                            <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>
+                            <div class="authForm">
+                                <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>
+                                        </div>
+                                        <select class="form-control select2 authMethod" name="auth_method">
+                                            <option value="">- None -</option>
+                                            <option value="local">Local</option>
+                                            <option value="azure">Azure</option>
+                                        </select>
                                     </div>
-                                    <select class="form-control select2" id="authMethod" name="auth_method">
-                                        <option value="">- None -</option>
-                                        <option value="local">Local</option>
-                                        <option value="azure">Azure</option>
-                                    </select>
                                 </div>
-                            </div>
 
-                            <!-- Password Form Group (Initially hidden) -->
-                            <div class="form-group" id="passwordGroup" style="display: none;">
-                                <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 type="password" class="form-control" data-toggle="password" name="contact_password" placeholder="Enter a password" autocomplete="new-password">
-                                    <div class="input-group-append">
-                                        <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
+                                <!-- Password Form Group (Initially hidden) -->
+                                <div class="form-group passwordGroup" style="display: none;">
+                                    <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 type="password" class="form-control" data-toggle="password" name="contact_password" placeholder="Enter a password" 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>
                             </div>
@@ -233,17 +235,4 @@
             </form>
         </div>
     </div>
-</div>
-
-<!-- JavaScript to Show/Hide Password Form Group -->
-<script>
-    $(document).ready(function() {
-        $('#authMethod').on('change', function() {
-            if ($(this).val() === 'local') {
-                $('#passwordGroup').show();
-            } else {
-                $('#passwordGroup').hide();
-            }
-        });
-    });
-</script>
+</div>
\ No newline at end of file
diff --git a/client_contact_details.php b/client_contact_details.php
index 81931da1..1ce7ead2 100644
--- a/client_contact_details.php
+++ b/client_contact_details.php
@@ -562,5 +562,20 @@ if (isset($_GET['contact_id'])) {
     }
 </script>
 
+<!-- JavaScript to Show/Hide Password Form Group -->
+<script>
+    $(document).ready(function() {
+        $('.authMethod').on('change', function() {
+            var $form = $(this).closest('.authForm');
+            if ($(this).val() === 'local') {
+                $form.find('.passwordGroup').show();
+            } else {
+                $form.find('.passwordGroup').hide();
+            }
+        });
+        $('.authMethod').trigger('change');
+    });
+</script>
+
 <?php
 require_once("footer.php");
diff --git a/client_contact_edit_modal.php b/client_contact_edit_modal.php
index 2a740fb2..87c62fd9 100644
--- a/client_contact_edit_modal.php
+++ b/client_contact_edit_modal.php
@@ -177,37 +177,35 @@
                             </div>
 
                             <?php if($config_client_portal_enable == 1) { ?>
-                            <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>
+                            <div class="authForm">
+                                <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>
+                                        </div>
+                                        <select class="form-control select2 authMethod" name="auth_method">
+                                            <option value="">- None -</option>
+                                            <option value="local" <?php if ($auth_method == "local") {echo "selected";} ?>>Local</option>
+                                            <option value="azure" <?php if ($auth_method == "azure") {echo "selected";} ?>>Azure</option>
+                                        </select>
                                     </div>
-                                    <select class="form-control select2" name="auth_method">
-                                        <option value="">- None -</option>
-                                        <option value="local" <?php if ($auth_method == "local") {echo "selected";} ?>>Local</option>
-                                        <option value="azure" <?php if ($auth_method == "azure") {echo "selected";} ?>>Azure</option>
-                                    </select>
                                 </div>
-                            </div>
 
-                            <?php if ($auth_method == "local") { ?>
-
-                            <div class="form-group">
-                                <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 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 class="form-group passwordGroup" style="display: none;">
+                                    <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 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>
                             </div>
 
-                            <?php } ?>
-
                             <div class="form-check">
                                 <input type="checkbox" class="form-check-input" name="send_email" value=""/>
                                 <label class="form-check-label">Send user e-mail with login details?</label>
@@ -254,4 +252,4 @@
             </form>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/client_contacts.php b/client_contacts.php
index ebc34902..295b7dd3 100644
--- a/client_contacts.php
+++ b/client_contacts.php
@@ -230,6 +230,21 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
         </div>
     </div>
 
+<!-- JavaScript to Show/Hide Password Form Group -->
+<script>
+    $(document).ready(function() {
+        $('.authMethod').on('change', function() {
+            var $form = $(this).closest('.authForm');
+            if ($(this).val() === 'local') {
+                $form.find('.passwordGroup').show();
+            } else {
+                $form.find('.passwordGroup').hide();
+            }
+        });
+        $('.authMethod').trigger('change');
+    });
+</script>
+
 <?php
 
 require_once("client_contact_add_modal.php");