diff --git a/app/views/devise/sessions/new.haml b/app/views/devise/sessions/new.haml
index 04e3d4aff..1e9b883a3 100644
--- a/app/views/devise/sessions/new.haml
+++ b/app/views/devise/sessions/new.haml
@@ -36,6 +36,8 @@
         = f.text_field :username
         %span.pod_location
           ="@#{AppConfig[:pod_uri].host}"
+          %br
+          %br
 
       %p
         = f.label :password , t('password')
@@ -45,14 +47,20 @@
             = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name)
           - else
             \.
-
-      %p.submit
-        = f.submit t('.sign_in')
-        %span
+          %br
           - if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations'
             = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
           - else
             \.
 
+      %p.submit
+        = f.submit t('.sign_in')
+        %span#remember_me
+          - if devise_mapping.rememberable?
+            = f.check_box :remember_me
+            = f.label :remember_me, t('.remember_me')
+          - else
+            \.
+
     = image_tag 'ajax-loader.gif', :id => "spinner", :class => "hidden"
 
diff --git a/app/views/devise/sessions/new.mobile.haml b/app/views/devise/sessions/new.mobile.haml
index 9f0d0d22a..1f2729717 100644
--- a/app/views/devise/sessions/new.mobile.haml
+++ b/app/views/devise/sessions/new.mobile.haml
@@ -14,6 +14,9 @@
       = f.label :password , t('password')
       = f.password_field :password
   = f.submit t('.sign_in')
+  - if devise_mapping.rememberable?
+    = f.check_box :remember_me
+    = f.label :remember_me, t('.remember_me')
 
 %p
   = render :partial => "devise/shared/links"
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 5a2fa81d0..a5e6bcd6a 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2397,6 +2397,7 @@ ul.show_comments
 
       &.submit
         :width auto
+        :bottom 15px
 
         input
           :width auto
@@ -2463,3 +2464,12 @@ ul.show_comments
 
 #sort_by
   :text-align right
+
+#remember_me
+  input[type='checkbox']
+    :display inline
+    :height auto !important
+    :top 2px !important
+  label
+    :font-size inherit !important
+    :position static
diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass
index 26eeb1af7..06e94078a 100644
--- a/public/stylesheets/sass/mobile.sass
+++ b/public/stylesheets/sass/mobile.sass
@@ -61,6 +61,7 @@ a
 
 .login_form
   @include mobile-box
+  :padding 10px
   label
     :font-weight bold