diff --git a/ChangeLog b/ChangeLog
index 8449b6ccc..bdd0e8c1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-09  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/SOGoRootPage.js (onLoginClick): don't
+	assume that the checkbox rememberLogin is always part of the template.
+
 2011-11-01  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxAclEditor.js (addUser): fixed CSS class
diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index 2ac4436a0..1f4b15933 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -86,7 +86,8 @@ function onLoginClick(event) {
                            : ("&language=" + language.value));
         if (domain)
             parameters += "&domain=" + domain.value;
-        if ($("rememberLogin").checked)
+        var rememberLogin = $("rememberLogin");
+        if (rememberLogin && rememberLogin.checked)
             parameters += "&rememberLogin=1";
 
         /// Discarded as it seems to create a cookie for nothing. To discard