diff --git a/web/styles/modal.css b/web/styles/modal.css
index 29a11d027f..47a62835d3 100644
--- a/web/styles/modal.css
+++ b/web/styles/modal.css
@@ -365,6 +365,7 @@
     box-shadow: inset 0 1px 1px hsl(0deg 0% 0% / 7.5%);
     transition: border linear 0.2s, box-shadow linear 0.2s;
     margin-bottom: 10px;
+    width: 206px;
 
     &:focus {
         border-color: hsl(206deg 80% 62% / 80%);
diff --git a/web/templates/dialog_change_password.hbs b/web/templates/dialog_change_password.hbs
index 3636c33862..7e79992225 100644
--- a/web/templates/dialog_change_password.hbs
+++ b/web/templates/dialog_change_password.hbs
@@ -1,7 +1,7 @@
 <form id="change_password_container">
     <div class="field password-div">
         <label for="old_password" class="title">{{t "Old password" }}</label>
-        <input type="password" autocomplete="off" name="old_password" id="old_password" class="w-200 inline-block modal_text_input modal_password_input" value="" />
+        <input type="password" autocomplete="off" name="old_password" id="old_password" class="w-200 inline-block modal_password_input" value="" />
         <i class="fa fa-eye-slash password_visibility_toggle tippy-zulip-tooltip" role="button"></i>
         <div class="settings-forgot-password">
             <a href="/accounts/password/reset/" class="sea-green" target="_blank" rel="noopener noreferrer">{{t "Forgot it?" }}</a>
@@ -9,7 +9,7 @@
     </div>
     <div class="field password-div">
         <label for="new_password" class="title">{{t "New password" }}</label>
-        <input type="password" autocomplete="new-password" name="new_password" id="new_password" class="w-200 inline-block modal_text_input modal_password_input" value=""
+        <input type="password" autocomplete="new-password" name="new_password" id="new_password" class="w-200 inline-block modal_password_input" value=""
           data-min-length="{{password_min_length}}" data-min-guesses="{{password_min_guesses}}" />
         <i class="fa fa-eye-slash password_visibility_toggle tippy-zulip-tooltip" role="button"></i>
         <div class="progress inline-block" id="pw_strength">
diff --git a/web/templates/settings/api_key_modal.hbs b/web/templates/settings/api_key_modal.hbs
index f34ad99d77..c4c94d75e6 100644
--- a/web/templates/settings/api_key_modal.hbs
+++ b/web/templates/settings/api_key_modal.hbs
@@ -14,7 +14,7 @@
                         <p>{{t "Please re-enter your password to confirm your identity." }}</p>
                         <div class="password-div">
                             <label for="password">{{t "Your password" }}</label>
-                            <input type="password" autocomplete="off" name="password" id="get_api_key_password" class="modal_text_input modal_password_input" value="" />
+                            <input type="password" autocomplete="off" name="password" id="get_api_key_password" class=" modal_password_input" value="" />
                             <i class="fa fa-eye-slash password_visibility_toggle tippy-zulip-tooltip" role="button"></i>
                         </div>
                         <p class="small">
diff --git a/web/templates/settings/custom_user_profile_field.hbs b/web/templates/settings/custom_user_profile_field.hbs
index a0c2f79dd3..8097c04e0b 100644
--- a/web/templates/settings/custom_user_profile_field.hbs
+++ b/web/templates/settings/custom_user_profile_field.hbs
@@ -21,7 +21,7 @@
           value="{{ field_value.value }}" />
         <span class="remove_date"><i class="fa fa-close"></i></span>
         {{else if is_url_field }}
-        <input class="custom_user_field_value {{#if for_manage_user_modal}}modal_text_input modal_url_input{{else}}settings_text_input settings_url_input{{/if}}" type="{{ field_type }}" value="{{ field_value.value }}" maxlength="2048" />
+        <input class="custom_user_field_value {{#if for_manage_user_modal}}modal_url_input{{else}}settings_text_input settings_url_input{{/if}}" type="{{ field_type }}" value="{{ field_value.value }}" maxlength="2048" />
         {{else if is_pronouns_field}}
         <input class="custom_user_field_value pronouns_type_field {{#if for_manage_user_modal}}modal_text_input{{else}}settings_text_input{{/if}}" type="{{ field_type }}" value="{{ field_value.value }}" maxlength="50" />
         {{else}}