diff --git a/app/views/devise/sessions/new.haml b/app/views/devise/sessions/new.haml
index 4b56378c1..e3a39b473 100644
--- a/app/views/devise/sessions/new.haml
+++ b/app/views/devise/sessions/new.haml
@@ -5,10 +5,24 @@
 = content_for :head do
   :css
     header{ display:none; }
+    footer{ position: absolute; bottom: 12px; }
+
+  :javascript
+    $(document).ready( function(){
+      $("form").submit(function(){
+        $(this).fadeOut(200, function(){
+          $('#logo').animate({
+            'margin-top': '+=80'
+          }, 250, function(){
+            $("#spinner").fadeIn(300);
+          });
+        });
+      });
+    });
 
 .container{:style => 'text-align:center;'}
   #login
-    = image_tag('logo_caps.png')
+    = image_tag('logo_caps.png', :id => 'logo');
     %br
     %br
     = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
@@ -37,8 +51,6 @@
             = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
           - else
             \.
-    %br
-    %p.shared_links
-      /= render :partial => "devise/shared/links"
-      /- if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations'
+
+    = image_tag 'ajax-loader.gif', :id => "spinner", :class => "hidden"
 
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 6dc9d6be7..08e733bff 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2268,8 +2268,8 @@ ul.show_comments
     input[type='text'],
     input[type='password']
       :-webkit-box-shadow 0 1px 0px #fff, 0 -1px 0px #888
-      :-moz-box-shadow 0 1 0px #fff
-      :box-shadow 0 0 4px #fff
+      :-moz-box-shadow 0 1px 0px #fff, 0 -1px 0px #888
+      :box-shadow 0 1px 0px #fff, 0 -1px 0px #888
       :width 180px
       :max-width 180px
 
@@ -2302,3 +2302,5 @@ ul.show_comments
           &:hover
             :color #444
 
+#logo
+  :position relative