diff --git a/modoboa/static/css/login.css b/modoboa/static/css/login.css
index 55d2ed080..3c55e40da 100644
--- a/modoboa/static/css/login.css
+++ b/modoboa/static/css/login.css
@@ -5,23 +5,17 @@
     }
 }
 
-@media (min-width: 760px) {
-    #logo {
-        margin-top: 60px;
-        text-align: center;
-        margin: 30px 46px 30px 0;
-        max-width: 380px;
-    }
-    #logo img {
-        height: 100px;
-    }
+body{
+    background-color: #EDEDEC;
 }
 
-#box {
-    margin: 0 auto;
-    max-width: 350px;
+#logo{
+    margin-bottom: 5%;
 }
 
+.thumbnail{
+    background-color: transparent;
+}
 .form-actions { 
     background-color: transparent;
     padding-right: 0px;
@@ -29,12 +23,6 @@
     margin-bottom: 0px;
 }
 
-.login-form {
-    margin: 0 ;
-    max-width: 300px;
-    padding-bottom: 0;
-}
-
 .login-error {
     margin: 20px auto;
     max-width: 300px;
@@ -64,6 +52,5 @@ form.login-form div.checkbox button.btn{
 }
 
 .divider{
-    height: 12px;
-    border-bottom: 1px solid #E8E8E8;
-}
\ No newline at end of file
+    height: 2%;
+}
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html
index de0df1ec4..9e2b9f6d8 100644
--- a/modoboa/templates/registration/login.html
+++ b/modoboa/templates/registration/login.html
@@ -19,29 +19,32 @@
   </head>
   <body>
     <div class="container">
-      <div id="box">
+      <div id="box" class="col-lg-7 col-lg-offset-2">
       <div id="logo" class="row">
           <ul class="thumbnails">
               <li>
-                  <a href="#" class="thumbnail">
-                      <img src="{% get_modoboa_logo %}" />
-                  </a>
+                  <div class="col-lg-offset-1 col-lg-10">
+                      <a href="#" class="thumbnail">
+                          <img src="{% get_modoboa_logo %}" />
+                      </a>
+                  </div>
               </li>
           </ul>
       </div>
-      <form method="post" action="{% url 'modoboa.core.views.auth.dologin' %}" class="login-form well">
+      <div class=" divider"></div>
+      <form method="post" action="{% url 'modoboa.core.views.auth.dologin' %}" class="login-form form-horizontal">
         {% csrf_token %}
         {% render_field form.username %}
         {% render_field form.password %}
         <input type="hidden" name="next" value="{{ next }}" />
         <div class=" divider"></div>
-        <div class="input-group">
+        <div class="form-group">
             <div class="checkbox">
-              <label class="col-lg-9 col-md-9 col-sm-8 checkbox" for="id_rememberme">
+              <label class="col-sm-offset-4 col-lg-5 col-md-5 col-sm-4 checkbox" for="id_rememberme">
                   <input type="checkbox" id="id_rememberme" name="rememberme" />{% trans "Remember me" %}
               </label>
-            <div class="col-lg-3 col-md-3 col-sm-4">
-                <button class="btn btn-primary type="submit">{% trans "Log in" %}</button>
+            <div class="col-lg-3 col-md-2 col-sm-3">
+                <button class="btn btn-primary pull-right" type="submit">{% trans "Log in" %}</button>
             </div>
             </div>
         </div>