diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings
index 1ae7857ef..d7c1eb9b7 100644
--- a/UI/Common/English.lproj/Localizable.strings
+++ b/UI/Common/English.lproj/Localizable.strings
@@ -10,7 +10,7 @@
 "Address Book"	= "Address Book";
 "Mail" = "Mail";
 "Preferences" = "Preferences";
-"Sign Out" = "Sign Out";
+"Disconnect" = "Disconnect";
 "Right Administration" = "Right Administration";
 "Log Console (dev.)" = "Log Console (dev.)";
 
diff --git a/UI/Common/French.lproj/Localizable.strings b/UI/Common/French.lproj/Localizable.strings
index 2de07b5c9..257db60d7 100644
--- a/UI/Common/French.lproj/Localizable.strings
+++ b/UI/Common/French.lproj/Localizable.strings
@@ -8,7 +8,7 @@
 "Address Book"	= "Carnet d'adresses";
 "Mail" = "Courrier";
 "Preferences" = "Préférences";
-"Sign Out" = "Quitter";
+"Disconnect" = "Quitter";
 "Right Administration" = "Partage";
 "Log Console (dev.)" = "Journal (dév.)";
 
diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings
index 9cc6c319a..534d91a00 100644
--- a/UI/MainUI/English.lproj/Localizable.strings
+++ b/UI/MainUI/English.lproj/Localizable.strings
@@ -2,7 +2,7 @@
 
 "title" = "SOGo";
 
-"Login:" = "Login:";
+"Username:" = "Username:";
 "Password:" = "Password:";
 
 "Connect" = "Connect";
diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings
index 2cd2ec069..b22b0c9e3 100644
--- a/UI/MainUI/French.lproj/Localizable.strings
+++ b/UI/MainUI/French.lproj/Localizable.strings
@@ -2,7 +2,7 @@
 
 "title" = "SOGo";
 
-"Login:" = "Nom d'utilisateur :";
+"Username:" = "Nom d'utilisateur :";
 "Password:" = "Mot de passe :";
 
 "Connect" = "Connexion";
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 78353a75b..3eaf672a3 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -13,7 +13,7 @@
       <img id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
       <var:if condition="shortUserNameForDisplay" const:value="wrongusernamepassword"
       ><p class="error"><var:string label:value="Wrong username or password."/></p>
-      </var:if><label><var:string label:value="Login:"/><br/>
+      </var:if><label><var:string label:value="Username:"/><br/>
 	<input class="textField" id="userName" name="userName"
 	  type="text" var:value="userName" /></label><br/>
       <label><var:string label:value="Password:"/><br/>
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 837071a85..9e38a1217 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -45,7 +45,7 @@
 		  ><div id="logConsole"><!-- space --></div></var:if>
 		<div id="linkBanner" class="linkbanner">
 		  <a id="logoff" var:href="logoffPath"
-		    ><var:string label:value="Sign Out" /></a>
+		    ><var:string label:value="Disconnect" /></a>
 		  <a var:href="relativeCalendarPath"
 		    ><var:string label:value="Calendar" /></a> |
 		  <a var:href="relativeContactsPath"