diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 81e4472d07..9c27eb72ca 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -4,7 +4,7 @@
<%= devise_error_messages! %>
<%= f.label :email %>
- <%= f.email_field :email %>
+ <%= f.email_field :email, :autofocus => true %>
<%= f.submit "Resend confirmation instructions" %>
<% end %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index fe620ef41f..34a49604a8 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -5,7 +5,7 @@
<%= f.hidden_field :reset_password_token %>
<%= f.label :password, "New password" %>
- <%= f.password_field :password %>
+ <%= f.password_field :password, :autofocus => true %>
<%= f.label :password_confirmation, "Confirm new password" %>
<%= f.password_field :password_confirmation %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 23501646a8..5a400df1fa 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -4,7 +4,7 @@
<%= devise_error_messages! %>
<%= f.label :email %>
- <%= f.email_field :email %>
+ <%= f.email_field :email, :autofocus => true %>
<%= f.submit "Send me reset password instructions" %>
<% end %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index ebca9ed335..1f6bbf6bf6 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -4,7 +4,7 @@
<%= devise_error_messages! %>
<%= f.label :email %>
- <%= f.email_field :email %>
+ <%= f.email_field :email, :autofocus => true %>
<%= f.label :password %> (leave blank if you don't want to change it)
<%= f.password_field :password, :autocomplete => "off" %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 9703db3718..3f189d46c7 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -4,7 +4,7 @@
<%= devise_error_messages! %>
<%= f.label :email %>
- <%= f.email_field :email %>
+ <%= f.email_field :email, :autofocus => true %>
<%= f.label :password %>
<%= f.password_field :password %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 7966ab993c..f9bc2c16fe 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -2,7 +2,7 @@
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<%= f.label :email %>
- <%= f.email_field :email %>
+ <%= f.email_field :email, :autofocus => true %>
<%= f.label :password %>
<%= f.password_field :password %>
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
index e55e82ee6f..020787f8ea 100644
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -4,7 +4,7 @@
<%= devise_error_messages! %>
<%= f.label :email %>
- <%= f.email_field :email %>
+ <%= f.email_field :email, :autofocus => true %>
<%= f.submit "Resend unlock instructions" %>
<% end %>
diff --git a/lib/generators/templates/simple_form_for/confirmations/new.html.erb b/lib/generators/templates/simple_form_for/confirmations/new.html.erb
index c488db7119..c2387ac49a 100644
--- a/lib/generators/templates/simple_form_for/confirmations/new.html.erb
+++ b/lib/generators/templates/simple_form_for/confirmations/new.html.erb
@@ -4,7 +4,7 @@
<%= f.error_notification %>
- <%= f.input :email, :required => true %>
+ <%= f.input :email, :required => true, :autofocus => true %>