diff --git a/modoboa/static/css/login.css b/modoboa/static/css/login.css
index 3c55e40da..6418ac65d 100644
--- a/modoboa/static/css/login.css
+++ b/modoboa/static/css/login.css
@@ -15,6 +15,7 @@ body{
 
 .thumbnail{
     background-color: transparent;
+    border-color: transparent;
 }
 .form-actions { 
     background-color: transparent;
@@ -32,9 +33,6 @@ html body div.container div#box div#logo.row ul.thumbnails li{
     list-style-type: none;
 }
 
-.thumbnail{
-    border: none;
-}
 
 .thumbnails{
     padding-left: 0;
@@ -51,6 +49,7 @@ form.login-form div.checkbox button.btn{
     margin-bottom:20px;
 }
 
-.divider{
-    height: 2%;
+.login-form .form-group div.checkbox label{
+    padding-top: 0;
+    padding-bottom: 10px;
 }
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html
index 9e2b9f6d8..c8b1fed0a 100644
--- a/modoboa/templates/registration/login.html
+++ b/modoboa/templates/registration/login.html
@@ -19,11 +19,11 @@
   </head>
   <body>
     <div class="container">
-      <div id="box" class="col-lg-7 col-lg-offset-2">
+      <div id="box" class="col-lg-9 col-lg-offset-2">
       <div id="logo" class="row">
           <ul class="thumbnails">
               <li>
-                  <div class="col-lg-offset-1 col-lg-10">
+                  <div class="col-lg-offset-3 col-lg-5">
                       <a href="#" class="thumbnail">
                           <img src="{% get_modoboa_logo %}" />
                       </a>
@@ -37,14 +37,16 @@
         {% render_field form.username %}
         {% render_field form.password %}
         <input type="hidden" name="next" value="{{ next }}" />
-        <div class=" divider"></div>
         <div class="form-group">
+            <div class="control-label col-lg-3 col-md-4 col-sm-4 ">
+            </div>
+            <div class="col-lg-5 col-md-5 col-sm-5">
             <div class="checkbox">
-              <label class="col-sm-offset-4 col-lg-5 col-md-5 col-sm-4 checkbox" for="id_rememberme">
+              <label class="checkbox" for="id_rememberme">
                   <input type="checkbox" id="id_rememberme" name="rememberme" />{% trans "Remember me" %}
               </label>
-            <div class="col-lg-3 col-md-2 col-sm-3">
-                <button class="btn btn-primary pull-right" type="submit">{% trans "Log in" %}</button>
+
+                <button class="btn btn-primary col-lg-12" type="submit">{% trans "Log in" %}</button>
             </div>
             </div>
         </div>