diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml
index 5799b1bd2..37d0ee01b 100644
--- a/app/views/sessions/new.haml
+++ b/app/views/sessions/new.haml
@@ -39,7 +39,7 @@
           - if devise_mapping.rememberable?
             = f.check_box :remember_me, :tabindex => 3
             = f.label :remember_me, t('devise.sessions.new.remember_me')
-        = f.submit 'Log in', :tabindex => 4
+        = f.submit t('devise.sessions.new.sign_in'), :tabindex => 4
 
 
       - if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations'
diff --git a/public/javascripts/login.js b/public/javascripts/login.js
index 8f5c8297d..7a9c4f766 100644
--- a/public/javascripts/login.js
+++ b/public/javascripts/login.js
@@ -27,7 +27,7 @@ $(document).ready( function(){
     controls.addClass('hidden');
   });
 
-  $(document).keydown(function(){
+  $(document).keyup(function(){
     if(contentFilled()){
       controls.removeClass('hidden');
     }else{