diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index eea9c68da..6f88366ed 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -289,7 +289,7 @@
                   /><input const:id="newPasswordConfirmationField" class="textField"
                   type="password" const:value=""/></label><br/>
               <a href="#" class="button" id="changePasswordBtn"
-                ><span><var:string label:value="Change"/></span></a>
+                ><span><var:string label:value="Change"/></span></a><br/>
             </p>
             <p id="passwordError"><!-- space --></p>
           </div>
diff --git a/UI/WebServerResources/UIxPreferences.css b/UI/WebServerResources/UIxPreferences.css
index 13e8c5fb4..4d4506988 100644
--- a/UI/WebServerResources/UIxPreferences.css
+++ b/UI/WebServerResources/UIxPreferences.css
@@ -63,7 +63,8 @@ DIV#windowButtons
 { height: 50px; }
 #vacation SPAN
 { float: right; }
-#vacation BR
+#vacation BR,
+#passwordView BR
 { clear: both; }
 
 DIV.bottomToolbar
@@ -106,22 +107,11 @@ TD.activeColumn
 
 P#passwordFields,
 P#passwordError
-{ position: absolute;
-  left: 0px; }
-
-#passwordFields
-{ top: 40px;
-  width: 410px;
+{ width: 410px; 
   text-align: right; }
 
-P#passwordError
-{ top: 92px;
-  width: 307px;
-  text-align: right;
-  margin-left: 40px; }
-
 P.errorMessage#passwordError
 { color: #f00; }
 
 P.infoMessage#passwordError
-{ color: #00f; }
+{ color: #00f; }
\ No newline at end of file