diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index 5549d974b..a2c9c18dc 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
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/SOGoRootPage.css b/UI/WebServerResources/SOGoRootPage.css
index 2ec3f557f..93aa084f6 100644
--- a/UI/WebServerResources/SOGoRootPage.css
+++ b/UI/WebServerResources/SOGoRootPage.css
@@ -36,7 +36,7 @@ A:link,
 A:visited
 { color: #54b948; }
 
-DIV#aboutBox DIV A.button
+DIV A.button
 { color: #000; }
 
 DIV#aboutBox P.logo
diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index fa65003f6..cc58cfd42 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -192,10 +192,10 @@ function showPasswordDialog(dialogType, constructor, parameters) {
         dialogs[dialogType] = dialog;
     }
     var password = $("password");
-    var offsets = password.cumulativeOffset();
+    var offsets = password.positionedOffset();
     dialog.show();
-    var top = offsets[1] + 5;
-    var left = offsets[0] + password.clientWidth - dialog.clientWidth;
+    var top = offsets[1] - 2;
+    var left = offsets[0] + 10 - dialog.clientWidth;
     dialog.setStyle({ "top": top + "px", "left": left + "px"});
 }
 
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 4768e18f6..ead861bf4 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -936,26 +936,24 @@ function changeDateSelectorDisplay(day, keepCurrentDay) {
         url += "?day=" + day;
     }
 
-    if (day != currentDay) {
-        if (!keepCurrentDay)
-            currentDay = day;
-
-        var month = day.substr(0, 6);
-        if (cachedDateSelectors[month]) {
-            //       log ("restoring cached selector for month: " + month);
-            setDateSelectorContent(cachedDateSelectors[month]);
-        }
-        else {
-            //       log ("loading selector for month: " + month);
-            if (document.dateSelectorAjaxRequest) {
-                document.dateSelectorAjaxRequest.aborted = true;
-                document.dateSelectorAjaxRequest.abort();
-            }
-            document.dateSelectorAjaxRequest
-                = triggerAjaxRequest(url,
-                                     dateSelectorCallback,
-                                     month);
+    if (!keepCurrentDay)
+        currentDay = day;
+    
+    var month = day.substr(0, 6);
+    if (cachedDateSelectors[month]) {
+        //       log ("restoring cached selector for month: " + month);
+        setDateSelectorContent(cachedDateSelectors[month]);
+    }
+    else {
+        //       log ("loading selector for month: " + month);
+        if (document.dateSelectorAjaxRequest) {
+            document.dateSelectorAjaxRequest.aborted = true;
+            document.dateSelectorAjaxRequest.abort();
         }
+        document.dateSelectorAjaxRequest
+            = triggerAjaxRequest(url,
+                                 dateSelectorCallback,
+                                 month);
     }
 }
 
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