diff --git a/ChangeLog b/ChangeLog
index 432c50c3d..2324f4ec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-03-15  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/generic.js (onPreferencesClick): don't
+	allow the user to open the preferences window multiple times.
+
 	* UI/WebServerResources/SOGoDragHandles.js (enableRightSafety):
 	new method to display a "safety" block on top of the right block
 	when dragging the handle. This fixes a problem when the right
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 1d0f6acbd..91817c758 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1664,7 +1664,7 @@ function onPreferencesClick(event) {
         div.show(); //setStyle({display: "block"});
     }
     else {
-        var w = window.open(urlstr, "_blank",
+        var w = window.open(urlstr, "SOGoPreferences",
                             "width=580,height=450,resizable=1,scrollbars=0,location=0");
         w.opener = window;
         w.focus();