diff --git a/NEWS b/NEWS
index 628a91987..8947cccfd 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@
 - fixed search in message content;
 - added tooltips for toolbar buttons (English and French);
 - added checkmarks in live search options popup menus;
+- added browser detection with recommanded alternatives;
 - initial support for resizable columns in tables;
 - improved IE7 and Safari support: attendees selector;
 - countless bugfixes;
diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings
index f25d4d2f4..6d453e131 100644
--- a/UI/Common/English.lproj/Localizable.strings
+++ b/UI/Common/English.lproj/Localizable.strings
@@ -27,6 +27,11 @@
 
 "Sorry, the user rights can not be configured for that object." = "Sorry, the user rights can not be configured for that object.";
 
+"browserNotCompatible" = "We've detected that your browser version is currently not supported on this site. Our recommendation is to use Firefox. Link to download the most current version of this browser is provided bellow:";
+"alternativeBrowsers" = "Alternatively, you can also use the following compatible browsers";
+"alternativeBrowserSafari" = "Alternatively, you can also use Safari.";
+"Download" = "Download";
+
 /* generic.js */
 "Unable to subscribe to that folder!"
 	= "Unable to subscribe to that folder!";
diff --git a/UI/Common/French.lproj/Localizable.strings b/UI/Common/French.lproj/Localizable.strings
index 839c0bb88..7cd854ba0 100644
--- a/UI/Common/French.lproj/Localizable.strings
+++ b/UI/Common/French.lproj/Localizable.strings
@@ -28,6 +28,11 @@
 
 "Sorry, the user rights can not be configured for that object." = "Sorry, the user rights can not be configured for that object.";
 
+"browserNotCompatible" = "La version de votre navigateur Web n'est présentement pas supportée par ce site. Nous recommandons d'utiliser Firefox. Vous trouverez un lien vers la plus récente version de ce navigateur ci-dessous:";
+"alternativeBrowsers" = "Comme alternative, vous pouvez aussi utiliser les navigateurs suivants:";
+"alternativeBrowserSafari" = "Comme alternative, vous pouvez aussi utiliser Safari.";
+"Download" = "Télécharger";
+
 /* generic.js */
 "Unable to subscribe to that folder!" = "Impossible de s'abonner à ce dossier.";
 "You cannot subscribe to a folder that you own!" = "Impossible de vous abonner à un dossier qui vous appartient.";
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index 4f631eeeb..193781ed9 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -267,7 +267,7 @@
   cc = [[context request] clientCapabilities];
 
   //NSLog(@"Browser = %@", [cc description]);
-  //NSLog(@"User agent = %@", [cc userAgent]);
+  NSLog(@"User agent = %@", [cc userAgent]);
   //NSLog(@"Browser major version = %i", [cc majorVersion]);
 
   return ( 
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 8cc188326..8c80ed089 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -97,16 +97,16 @@
         <var:if condition="isCompatibleBrowser" const:negate="YES">
     <div id="loginScreen">
       <img id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
-      <p>SOGo requires a modern browser to work properly. We suggest to use the latest version of Firefox.</p>
-      <p class="browser"><a href="http://www.getfirefox.com/"><img rsrc:src="browser_firefox.gif"/>Download Firefox</a></p>
+      <p><var:string label:value="browserNotCompatible"/></p>
+      <p class="browser"><a href="http://www.getfirefox.com/"><img rsrc:src="browser_firefox.gif"/><var:string label:value="Download"/> Firefox</a></p>
     <var:if condition="isIE7Compatible">
-      <p>Alternatively, you can also use the following compatible browsers:</p>
-      <p class="browser"><a href="http://www.microsoft.com/ie/download/"><img rsrc:src="browser_ie.gif"/>Download Internet Explorer 7</a></p>
-      <p class="browser"><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/>Download Safari 3</a></p>
+      <p><var:string label:value="alternativeBrowsers"/></p>
+      <p class="browser"><a href="http://www.microsoft.com/ie/download/"><img rsrc:src="browser_ie.gif"/><var:string label:value="Download"/> Internet Explorer 7</a></p>
+      <p class="browser"><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
     </var:if>
     <var:if condition="isMac">
-      <p>Alternatively, you can also use Safari.</p>
-      <p><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/>Download Safari 3</a></p>
+      <p><var:string value:label="alternativeBrowserSafari"/></p>
+      <p class="browser"><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
     </var:if>
     </div>
   </var:if>
diff --git a/UI/WebServerResources/SOGoRootPage.css b/UI/WebServerResources/SOGoRootPage.css
index c104f6f5c..9654ce87d 100644
--- a/UI/WebServerResources/SOGoRootPage.css
+++ b/UI/WebServerResources/SOGoRootPage.css
@@ -15,7 +15,6 @@ DIV#loginScreen
   padding: 5px;
   border: 2px solid transparent;
   width: 200px;
-  height: 315px;
   -moz-border-top-colors: #efebe7 #fff;
   -moz-border-left-colors: #efebe7 #fff;
   -moz-border-right-colors: #000 #9c9a94 transparent;