diff --git a/ChangeLog b/ChangeLog
index 39f616753..65a677992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-02  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/MailerUI.js (_onMenuLabelFlagX): fixed a
+	bug when changing the flag of multiple messages.
+
+	* UI/WebServerResources/SOGoRootPage.js (onLoginClick): reset
+	error message (if any) when login in.
+
 2011-08-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreFSMessage.m
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index da8566a00..4ddec2c6e 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2439,8 +2439,10 @@ function _onMenuLabelFlagX(flag) {
                      $('row_' + Mailer.currentMessages[Mailer.currentMailbox]).getAttribute("labels"));
     else if (Object.isArray(document.menuTarget))
         // Menu called from multiple selection in messages list view
-        $(document.menuTarget).collect(function(row) {
-                messages.set(row.getAttribute("id").substr(4),
+        $(document.menuTarget).collect(function(rowID) {
+            var row = $(rowID);
+            if (row)
+                messages.set(rowID.substr(4),
                              row.getAttribute("labels"));
             });
     else
diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index 8fa4a6491..6461c862a 100644
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -62,6 +62,8 @@ function onLoginClick(event) {
     var language = $("language");
     var domain = $("domain");
 
+    SetLogMessage("errorMessage");
+
     if (userName.length > 0 && password.length > 0) {
         this.disabled = true;
         startAnimation($("animation"));