diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index 2d6e99de5e..f26dc85c42 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -106,21 +106,45 @@ a.thumbnail:hover{
     padding-top: 10px;
     padding-left: 20px;
 }
-#formLogin .input-group{
+#form-login .input-group{
     margin-top: 10px;
     margin-bottom: 10px;
 }
-#formLogin label{
+#form-login label{
     display: none;
 }
-#login_block #formLogin .form-group{
+#login-block #formLogin .form-group{
     display: none;
 }
-#login_block .nav-pills{
+#login-block .nav-pills{
     margin-bottom: 5px;
     padding-top: 10px;
     margin-top: 5px;
 }
+#login-block .btn-group, .btn-group-vertical{
+    width: 100%;
+}
+#login-block .btn-group > .btn{
+    width: 100%;
+    text-align: left;
+}
+#login-block .btn-group > .btn span.caret{
+    right: 8px;
+    top: 15px;
+    position: absolute;
+}
+#login-block .dropdown-menu{
+    width: 100%;
+}
+/* links dropdown flag */
+#login-block .dropdown-toggle{
+    display: block;
+    width: 100%;
+    padding: 5px;
+}
+#login-block .btn-language.open .dropdown-menu{
+    display: block;
+}
 #toolbar-admin.navbar{
     margin-bottom: 0;
     border-radius: 0;
diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php
index 99a452b93e..e1785835cb 100755
--- a/main/admin/configure_homepage.php
+++ b/main/admin/configure_homepage.php
@@ -1011,10 +1011,10 @@ switch ($action) {
                 <div class="col-md-3">
 
                     <!-- login block -->
-                    <div id="login_block" class="panel panel-default">
+                    <div id="login-block" class="panel panel-default">
                         <div class="panel-body">
-                            <?php echo api_display_language_form(); ?>
-                            <form id="formLogin" class="form-horizontal">
+                            <?php echo api_display_language_form(false, true); ?>
+                            <form id="form-login" class="form-horizontal">
                                 <div class="input-group">
                                     <div class="input-group-addon"><em class="fa fa-user"></em></div>
                                     <input class="form-control" type="text" id="login" value="" disabled="disabled"/>
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index cb163a443d..9c6feb888f 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -1472,7 +1472,7 @@ class Template
     public function displayLoginForm()
     {
         $form = new FormValidator(
-            'formLogin',
+            'form-login',
             'POST',
             null,
             null,
diff --git a/main/template/default/layout/login_form.tpl b/main/template/default/layout/login_form.tpl
index 6eb6d51236..008623c6ec 100755
--- a/main/template/default/layout/login_form.tpl
+++ b/main/template/default/layout/login_form.tpl
@@ -1,6 +1,6 @@
 {% if _u.logged  == 0 %}
     {% if login_form %}
-        <div id="login_block" class="panel panel-default">
+        <div id="login-block" class="panel panel-default">
             <div class="panel-body">
             {{ login_language_form }}
             {% if plugin_login_top is not null %}