diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index ad375e772..910135853 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -11,18 +11,18 @@
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="row">
     <div class="small-12 column">
-      <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label"), tabindex: "1" %>
+      <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label") %>
     </div>
 
     <div class="small-12 column">
-      <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "float-right", tabindex: "3" %>
-      <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label"), tabindex: "2" %>
+      <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label") %>
+      <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "float-right" %>
     </div>
 
     <% if devise_mapping.rememberable? -%>
       <div class="small-12 column">
         <%= f.label :remember_me do %>
-          <%= f.check_box :remember_me, title: t('devise_views.sessions.new.remember_me'), label: false, tabindex: "4" %>
+          <%= f.check_box :remember_me, title: t('devise_views.sessions.new.remember_me'), label: false %>
           <span class="checkbox"><%= t("devise_views.sessions.new.remember_me") %></span>
         <% end %>
       </div>
@@ -35,5 +35,3 @@
 <% end %>
 
 <%= render "devise/shared/links" %>
-
-
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index 1c6f81455..3ae3156f7 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -19,7 +19,7 @@
 
       <%= f.label :username %>
       <p class="note"><%= t("devise_views.users.registrations.new.username_note") %></p>
-      <%= f.text_field  :username, maxlength: User.username_max_length, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %>
+      <%= f.text_field :username,  autofocus: true, maxlength: User.username_max_length, placeholder: t("devise_views.users.registrations.new.username_label"), label: false %>
 
       <%= f.invisible_captcha :family_name %>