diff --git a/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.css b/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.css
index de750b1af..8d5942666 100644
--- a/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.css
+++ b/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.css
@@ -23,7 +23,8 @@ body {
   background-color: rgb(255,255,255);
   background-color: rgba(255,255,255,0.9);
   text-align: center;
-  padding-top: 20px;
+  padding-top: 10px;
+  overflow: hidden;
 }
 
 .panel, .navbar-default {
@@ -132,6 +133,7 @@ div.oidc_consent_message > ul {
     margin: 0 auto -60px;
   }
   #footer {
+    padding-top: 20px;
     height: 60px;
   }
 }
diff --git a/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.min.css b/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.min.css
index 18ba8ae27..7734078c8 100644
--- a/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.min.css
+++ b/lemonldap-ng-portal/site/htdocs/static/bootstrap/css/styles.min.css
@@ -1 +1 @@
-html,body{height:100%;background:radial-gradient(circle at 50% 0,#fff 0,#ddd 100%) no-repeat scroll 0 0 #ddd}#wrap{min-height:100%;height:auto;margin:0 auto -80px;padding:20px 0 80px}#footer{height:80px;background-color:#fff;background-color:rgba(255,255,255,0.9);text-align:center;padding-top:20px}.panel,.navbar-default{background-color:#fff;background-color:rgba(255,255,255,0.9);background-image:none}.login,.password,.confirm{text-align:center;padding:20px}div.form{margin:0 auto;max-width:330px}div.actions{margin:10px 0 0 0}div.actions a{margin-top:10px}.buttons{text-align:center;margin:10px 0 0 0}.btn{white-space:normal}.btn span.glyphicon{padding-right:8px}li.ui-state-active{background-color:#fafafa;background-color:rgba(250,250,250,0.9)}#appslist,#password,#loginHistory,#logout{margin-top:20px}div.application{height:50px;overflow:hidden}div.application a,div.application a:hover{text-decoration:none;display:block}div.application h4.appname{margin-top:5px}div.application p.appdesc{color:#aaa;font-style:italic}p.notifCheck label{margin-left:5px;margin-top:3px;display:inline-block}div.openidconnect button{height:60px;width:160px;margin-bottom:5px}div.openidconnect button img{height:30px}div.oidc_consent_message>ul{text-align:left;list-style:circle}@media(min-width:768px){div.application{height:80px}div.application h4.appname{margin:0}#wrap{margin:0 auto -60px}#footer{height:60px}}.hiddenFrame{border:0;display:hidden;margin:0}.noborder{border:0}
\ No newline at end of file
+html,body{height:100%;background:radial-gradient(circle at 50% 0,#fff 0,#ddd 100%) no-repeat scroll 0 0 #ddd}#wrap{min-height:100%;height:auto;margin:0 auto -80px;padding:20px 0 80px}#footer{height:80px;background-color:#fff;background-color:rgba(255,255,255,0.9);text-align:center;padding-top:10px;overflow:hidden}.panel,.navbar-default{background-color:#fff;background-color:rgba(255,255,255,0.9);background-image:none}.login,.password,.confirm{text-align:center;padding:20px}div.form{margin:0 auto;max-width:330px}div.actions{margin:10px 0 0 0}div.actions a{margin-top:10px}.buttons{text-align:center;margin:10px 0 0 0}.btn{white-space:normal}.btn span.glyphicon{padding-right:8px}li.ui-state-active{background-color:#fafafa;background-color:rgba(250,250,250,0.9)}#appslist,#password,#loginHistory,#logout{margin-top:20px}div.application{height:50px;overflow:hidden}div.application a,div.application a:hover{text-decoration:none;display:block}div.application h4.appname{margin-top:5px}div.application p.appdesc{color:#aaa;font-style:italic}p.notifCheck label{margin-left:5px;margin-top:3px;display:inline-block}div.openidconnect button{height:60px;width:160px;margin-bottom:5px}div.openidconnect button img{height:30px}div.oidc_consent_message>ul{text-align:left;list-style:circle}@media(min-width:768px){div.application{height:80px}div.application h4.appname{margin:0}#wrap{margin:0 auto -60px}#footer{padding-top:20px;height:60px}}.hiddenFrame{border:0;display:hidden;margin:0}.noborder{border:0}
\ No newline at end of file
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/footer.tpl b/lemonldap-ng-portal/site/templates/bootstrap/footer.tpl
index 385c44a34..a1e1738af 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/footer.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/footer.tpl
@@ -1,9 +1,13 @@
   </div>
 
   <div id="footer">
-    <div class="container">
+    <div class="col-md-2"></div>
+    <div class="col-md-8 col-xs-10">
       <TMPL_INCLUDE NAME="customfooter.tpl">
     </div>
+    <div class="col-md-2 col-xs-2 text-right">
+      <span id="languages"></span>
+    </div>
   </div>
 
 <!-- Constants -->
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
index 8d5d07a8d..c0bf753f2 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
@@ -4,7 +4,7 @@
   <div id="logincontent" class="container">
 
   <TMPL_IF NAME="AUTH_ERROR">
-  <div class="message message-<TMPL_VAR NAME="AUTH_ERROR_TYPE"> alert"><span trmsg="<TMPL_VAR NAME="AUTH_ERROR">"></span> <span id="languages"></span></div>
+  <div class="message message-<TMPL_VAR NAME="AUTH_ERROR_TYPE"> alert"><span trmsg="<TMPL_VAR NAME="AUTH_ERROR">"></span></div>
   </TMPL_IF>
 
   <TMPL_IF AUTH_LOOP>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
index 3850b2114..d48063691 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
@@ -61,7 +61,7 @@
       </ul>
 
       <div class="user navbar-right">
-        <p class="navbar-text"><span trspan="connectedAs">Connected as</span> <TMPL_VAR NAME="AUTH_USER"> <span id="languages"></span></p>
+        <p class="navbar-text"><span trspan="connectedAs">Connected as</span> <TMPL_VAR NAME="AUTH_USER"></p>
       </div>
 
     </div>