diff --git a/admin/models.py b/admin/models.py
index e7cdb1a24..a74a7808b 100644
--- a/admin/models.py
+++ b/admin/models.py
@@ -163,8 +163,6 @@ class User(DUser):
 
     @property
     def identity(self):
-        if self.email != "":
-            return self.email
         return self.username
 
     @property
diff --git a/auth/forms.py b/auth/forms.py
index ddb148482..7a1b4b5fb 100644
--- a/auth/forms.py
+++ b/auth/forms.py
@@ -4,10 +4,10 @@ from django.utils.translation import ugettext as _
 class LoginForm(forms.Form):
     username = forms.CharField(
         label=_("Username"),
-        widget=forms.TextInput()
+        widget=forms.TextInput(attrs={"class" : "span3"})
         )
     password = forms.CharField(
         label=_("Password"),
-        widget=forms.PasswordInput(),
+        widget=forms.PasswordInput(attrs={"class" : "span3"}),
         help_text=_("Password used to authenticate")
         )
diff --git a/static/css/login.css b/static/css/login.css
index 7a4c1e4f6..955aeab60 100644
--- a/static/css/login.css
+++ b/static/css/login.css
@@ -6,12 +6,6 @@
     height: 100px;
 }
 
-input[type="text"], 
-input[type="password"] { 
-    width: 315px;
-    padding: 7px;
-}
-
 .form-actions { 
     background-color: transparent;
     padding-right: 0px;
diff --git a/static/js/autocompleter.js b/static/js/autocompleter.js
index bc80df2f2..81b878675 100644
--- a/static/js/autocompleter.js
+++ b/static/js/autocompleter.js
@@ -107,7 +107,7 @@
         keydown: function(evt) {
             evt.stopPropagation();
 
-            switch (evt.keyCode) {
+            switch (evt.which) {
                 case 13:
                 case 27:
                     evt.preventDefault();
@@ -127,7 +127,7 @@
             evt.stopPropagation();
             evt.preventDefault();
 
-            switch (evt.keyCode) {
+            switch (evt.which) {
             case 40:
             case 38:
                 break;
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 43a44d520..cdcf3c7a3 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -17,15 +17,17 @@
   });
   </script>
 </head>
-
 <body>
   <div class="container">
-    <div class="row">
-      <div class="span4 offset4">
-        <div id="logo">
+    <div class="offset4">
+      <div class="row">
+        <div id="logo" class="span3">
           <img src="{{ MEDIA_URL }}css/modoboa.png" />
         </div>
-        <form method="post" action="{% url modoboa.auth.views.dologin %}" class="well">
+      </div>
+      <div class="row">
+        <form method="post" action="{% url modoboa.auth.views.dologin %}" 
+              class="well span3">
           {% render_form form %}
           <input type="hidden" name="next" value="{{ next }}" />
           <div class="form-actions">
@@ -35,8 +37,12 @@
             <button class="btn btn-primary pull-right" type="submit">{% trans "Log in" %}</button>
           </div>
         </form>
+      </div>
+      <div class="row">
+        <div class="span4">
         {% if error %}{% alert error "error" %}{% endif %}
       </div>
+      </div>
     </div>
   </div>