diff --git a/templates/pages/login/password/changepwdform.html.twig b/templates/pages/login/password/changepwdform.html.twig
index e1fb2c93f..c813b4bfd 100644
--- a/templates/pages/login/password/changepwdform.html.twig
+++ b/templates/pages/login/password/changepwdform.html.twig
@@ -21,21 +21,21 @@
 				    {% block old_password %}
 					<div>
 						<label for="old_pwd">{{ 'UI:Login:OldPasswordPrompt'|dict_s }}:</label>
-						<input type="password" id="old_pwd" name="old_pwd" value="">
-					</div>
-					{% endblock %}
+                        <input type="password" id="old_pwd" class="ibo-input" name="old_pwd" value="">
+                    </div>
+                    {% endblock %}
 					{% block new_password %}
 					<div>
 						<label for="new_pwd">{{ 'UI:Login:NewPasswordPrompt'|dict_s }}:</label>
-						<input type="password" id="new_pwd" name="new_pwd" value="">
-						<span class="message"></span>
-					</div>
-					<div>
-						<label for="retype_new_pwd">{{ 'UI:Login:RetypeNewPasswordPrompt'|dict_s }}:</label>
-						<input type="password" id="retype_new_pwd" name="retype_new_pwd" value="">
-						<span class="message"></span>
-					</div>
-					{% endblock %}
+                        <input type="password" id="new_pwd" class="ibo-input" name="new_pwd" value="">
+                        <span class="message"></span>
+                    </div>
+                        <div>
+                            <label for="retype_new_pwd">{{ 'UI:Login:RetypeNewPasswordPrompt'|dict_s }}:</label>
+                            <input type="password" id="retype_new_pwd" class="ibo-input" name="retype_new_pwd" value="">
+                            <span class="message"></span>
+                        </div>
+                    {% endblock %}
 				</div>
 				<div id="login-submit" class="changepwd-submit">
 					<div>
diff --git a/templates/pages/login/password/forgotpwdform.html.twig b/templates/pages/login/password/forgotpwdform.html.twig
index 91426cb53..58118ca01 100644
--- a/templates/pages/login/password/forgotpwdform.html.twig
+++ b/templates/pages/login/password/forgotpwdform.html.twig
@@ -8,27 +8,27 @@
 		<div id="login-title">
 			<h1>{{ 'UI:Login:ForgotPwdForm'|dict_s }}</h1>
 			<p>{{ 'UI:Login:ForgotPwdForm+'|dict_s }}</p>
-			{% if bFailedToReset %}
-				<p class="hilite">{{ 'UI:Login:ResetPwdFailed'|dict_format(sFailureReason) }}</p>
-			{% endif %}
-		</div>
-		<div id="login-form">
-			<form method="post">
-				<div id="login-form-content">
-					<div id="login-input">
-						<div>
-							<label for="user">{{ 'UI:Login:UserNamePrompt'|dict_s }}:</label>
-							<input id="user" type="text" name="auth_user" value="{{ sAuthUser }}">
-						</div>
-					</div>
-					<div id="login-submit" class="forgotpwd-submit">
-						<div>
-							<input type="submit" value="{{ 'UI:Login:ResetPassword'|dict_s }}">
-							<input class="login-submit-secondary" type="button" onClick="window.close();" value="{{ 'UI:Button:Cancel'|dict_s }}">
-						</div>
-					</div>
-				</div>
-				<input type="hidden" name="loginop" value="forgot_pwd_go">
+            {% if bFailedToReset %}
+                <p class="hilite">{{ 'UI:Login:ResetPwdFailed'|dict_format(sFailureReason) }}</p>
+            {% endif %}
+        </div>
+        <div id="login-form">
+            <form method="post">
+                <div id="login-form-content">
+                    <div id="login-input">
+                        <div>
+                            <label for="user">{{ 'UI:Login:UserNamePrompt'|dict_s }}:</label>
+                            <input id="user" class="ibo-input" type="text" name="auth_user" value="{{ sAuthUser }}">
+                        </div>
+                    </div>
+                    <div id="login-submit" class="forgotpwd-submit">
+                        <div>
+                            <input type="submit" value="{{ 'UI:Login:ResetPassword'|dict_s }}">
+                            <input class="login-submit-secondary" type="button" onClick="window.close();" value="{{ 'UI:Button:Cancel'|dict_s }}">
+                        </div>
+                    </div>
+                </div>
+                <input type="hidden" name="loginop" value="forgot_pwd_go">
 			</form>
 		</div>
 	</div>
diff --git a/templates/pages/login/password/resetpwdform.html.twig b/templates/pages/login/password/resetpwdform.html.twig
index 50d7359ba..f66c42858 100644
--- a/templates/pages/login/password/resetpwdform.html.twig
+++ b/templates/pages/login/password/resetpwdform.html.twig
@@ -26,16 +26,16 @@
 							<div id="login-input">
 								<div>
 									<label for="new_pwd">{{ 'UI:Login:NewPasswordPrompt'|dict_s }}:</label>
-									<input type="password" id="new_pwd" name="new_pwd" value="">
-								</div>
-								<div>
-									<label for="retype_new_pwd">{{ 'UI:Login:RetypeNewPasswordPrompt'|dict_s }}:</label>
-									<input type="password" id="retype_new_pwd" name="retype_new_pwd" value="">
-								</div>
-							</div>
-							<div id="login-submit">
-								<div>
-									<input type="submit" onClick="return DoCheckPwd();" value="{{ 'UI:Button:ChangePassword'|dict_s }}">
+                                    <input type="password" id="new_pwd" class="ibo-input" name="new_pwd" value="">
+                                </div>
+                                <div>
+                                    <label for="retype_new_pwd">{{ 'UI:Login:RetypeNewPasswordPrompt'|dict_s }}:</label>
+                                    <input type="password" id="retype_new_pwd" class="ibo-input" name="retype_new_pwd" value="">
+                                </div>
+                            </div>
+                            <div id="login-submit">
+                                <div>
+                                    <input type="submit" onClick="return DoCheckPwd();" value="{{ 'UI:Button:ChangePassword'|dict_s }}">
 								</div>
 							</div>
 					</div>