diff --git a/lib/views/user/_general_law_fields.html.erb b/lib/views/user/_general_law_fields.html.erb
index 30d0858..1148034 100644
--- a/lib/views/user/_general_law_fields.html.erb
+++ b/lib/views/user/_general_law_fields.html.erb
@@ -1,16 +1,16 @@
 <div class="row">
   <%= f.label :date_of_birth, _('Date of Birth') %>
-  <%= f.date_select :date_of_birth, 
+  <%= f.date_select :date_of_birth,
                     { :start_year => Time.now.year - 130,
                       :end_year => Time.now.year },
-                    :class => 'large-4 columns' %>
+                    :class => 'large-4 columns', :tabindex => 60 %>
 </div>
 
 <%= f.label :domicile, _('Domicile') %>
-<%= f.text_field :domicile, { :size => 15, :tabindex => 100 } %>
+<%= f.text_field :domicile, { :size => 15, :tabindex => 70 } %>
 
 <%= f.label :occupation, _('Occupation') %>
-<%= f.text_field :occupation, { :size => 15, :tabindex => 100 } %>
+<%= f.text_field :occupation, { :size => 15, :tabindex => 80 } %>
 
 <%= f.label :marital_status, _('Marital Status') %>
-<%= f.text_field :marital_status, { :size => 15, :tabindex => 100 } %>
+<%= f.text_field :marital_status, { :size => 15, :tabindex => 90 } %>
diff --git a/lib/views/user/_signin.html.erb b/lib/views/user/_signin.html.erb
index f63c289..a11e9de 100644
--- a/lib/views/user/_signin.html.erb
+++ b/lib/views/user/_signin.html.erb
@@ -9,20 +9,20 @@
 
     <p>
     <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label>
-    <%= text_field 'user_signin', 'email', { :size => 20, :tabindex => 60 } %>
+    <%= text_field 'user_signin', 'email', { :size => 20, :tabindex => 120 } %>
     </p>
 
     <p>
     <label class="form_label" for="user_signin_password"><%= _('Password:')%></label>
-    <%= password_field 'user_signin', 'password', { :size => 15, :tabindex => 70, :autocomplete => 'off' } %>
+    <%= password_field 'user_signin', 'password', { :size => 15, :tabindex => 130, :autocomplete => 'off' } %>
     </p>
 
     <p class="form_note">
-    <%= link_to _('Forgotten your password?'), signchangepassword_path(:pretoken => h(params[:token])), :tabindex => 80 %>
+    <%= link_to _('Forgotten your password?'), signchangepassword_path(:pretoken => h(params[:token])), :tabindex => 140 %>
     </p>
 
     <p class="form_checkbox">
-      <%= check_box_tag 'remember_me', "1", false, :tabindex => 90 %>
+      <%= check_box_tag 'remember_me', "1", false, :tabindex => 150 %>
 
       <label for="remember_me">
         <%= _('Remember me (keeps you signed in longer; do not use on a public computer)') %>
@@ -32,7 +32,7 @@
     <div class="form_button">
     <%= hidden_field_tag 'token', params[:token], {:id => 'signin_token' } %>
     <%= hidden_field_tag :modal, params[:modal], {:id => 'signin_modal' } %>
-    <%= submit_tag _('Sign in'), :tabindex => 100 %>
+    <%= submit_tag _('Sign in'), :tabindex => 160 %>
     </div>
 <% end %>
 
diff --git a/lib/views/user/_signup.html.erb b/lib/views/user/_signup.html.erb
index 9de386d..92d65ec 100644
--- a/lib/views/user/_signup.html.erb
+++ b/lib/views/user/_signup.html.erb
@@ -5,7 +5,7 @@
 
     <p>
         <%= f.label :email, _('Your e-mail:'), :class => 'form_label' %>
-        <%= f.text_field :email, { :size => 20, :tabindex => 60 } %>
+        <%= f.text_field :email, { :size => 20, :tabindex => 10 } %>
     </p>
     <div class="form_item_note">
         <%= _('We will not reveal your email address to anybody unless you or
@@ -14,7 +14,7 @@
 
     <p>
         <%= f.label :name, _('Your full name:'), :class => 'form_label' %>
-        <%= f.text_field :name, { :size => 20, :tabindex => 70, :autocomplete => "off" } %>
+        <%= f.text_field :name, { :size => 20, :tabindex => 20, :autocomplete => "off" } %>
     </p>
     <div class="form_item_note">
          <%= _('Your <strong>name will appear publicly</strong>
@@ -26,12 +26,12 @@
 
     <p>
         <%= f.label :password, _('Password:'), :class => 'form_label' %>
-        <%= f.password_field :password, { :size => 15, :tabindex => 80, :autocomplete => "off" } %>
+        <%= f.password_field :password, { :size => 15, :tabindex => 30, :autocomplete => "off" } %>
     </p>
 
     <p>
         <%= f.label :password_confirmation, _('Password: (again)'), :class => 'form_label' %>
-        <%= f.password_field :password_confirmation, { :size => 15, :tabindex => 90, :autocomplete => "off" } %>
+        <%= f.password_field :password_confirmation, { :size => 15, :tabindex => 40, :autocomplete => "off" } %>
     </p>
 
     <%= f.fields_for :general_law do |general_law_form| %>
@@ -43,7 +43,7 @@
             makes more sense to be in the GeneralLaw fieldset.
           %>
           <%= f.label :identity_card_number, _('Identity Card Number') %>
-          <%= f.text_field :identity_card_number, { :size => 15, :tabindex => 100, :placeholder => '999-999999-9999A' } %>
+          <%= f.text_field :identity_card_number, { :size => 15, :tabindex => 50, :placeholder => '999-999999-9999A' } %>
 
           <%= render :partial => 'general_law_fields', :locals => { :f => general_law_form } %>
 
@@ -55,7 +55,7 @@
     <% end %>
 
     <p class="form_checkbox">
-        <%= f.check_box :terms, :tabindex => 110 %>
+        <%= f.check_box :terms, :tabindex => 100 %>
         <%= f.label :terms, _('Please confirm that you have read the <a href="{{terms_url}}">Terms of Use</a> and <a href="{{privacy_url}}">Privacy Policy</a>.',
                   :terms_url => help_general_path(:action => 'terms_of_use'),
                   :privacy_url => help_general_path(:action => 'privacy_policy')) %>
@@ -69,7 +69,7 @@
     <div class="form_button">
       <%= hidden_field_tag 'token', params[:token], { :id => 'signup_token' } %>
       <%= hidden_field_tag :modal, params[:modal], { :id => 'signup_modal' } %>
-      <%= f.submit _('Sign up'), :tabindex => 120 %>
+      <%= f.submit _('Sign up'), :tabindex => 110 %>
     </div>
 
 <% end %>