diff --git a/app/views/checkout/_form.html.haml b/app/views/checkout/_form.html.haml
index 901fe64a00..9a705ef4b5 100644
--- a/app/views/checkout/_form.html.haml
+++ b/app/views/checkout/_form.html.haml
@@ -3,7 +3,7 @@
   = inject_available_payment_methods
   = inject_saved_credit_cards
 
-= f_form_for current_order,
+= form_for current_order,
   html: {name: "checkout",
     id: "checkout_form",
     novalidate: true,
diff --git a/app/views/checkout/_shipping.html.haml b/app/views/checkout/_shipping.html.haml
index c137f2cdee..1e50dc33f8 100644
--- a/app/views/checkout/_shipping.html.haml
+++ b/app/views/checkout/_shipping.html.haml
@@ -52,7 +52,8 @@
 
       .row
         .small-12.columns
-          = f.text_area :special_instructions, label: t(:checkout_instructions), size: "60x4", "ng-model" => "order.special_instructions"
+          %label{ for: 'order_special_instructions'}= t(:checkout_instructions)
+          = f.text_area :special_instructions, size: "60x4", "ng-model" => "order.special_instructions"
 
       .row
         .small-12.columns.text-right
diff --git a/app/views/user_passwords/edit.html.haml b/app/views/user_passwords/edit.html.haml
index 3042161881..eb1d9df0bc 100644
--- a/app/views/user_passwords/edit.html.haml
+++ b/app/views/user_passwords/edit.html.haml
@@ -1,4 +1,4 @@
-= f_form_for @spree_user, :as => :spree_user, :url => spree.spree_user_password_path, :method => :put do |f|
+= form_for @spree_user, :as => :spree_user, :url => spree.spree_user_password_path, :method => :put do |f|
   = render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user }
   %fieldset
     .row
@@ -6,9 +6,11 @@
         %legend= t(:change_my_password)
     .row
       .small-12.medium-6.large-4.columns.medium-centered.large-centered
+        %label{ for: 'spree_user_password'}= t(:password)
         = f.password_field :password
     .row
       .small-12.medium-6.large-4.columns.medium-centered.large-centered
+        %label{ for: 'spree_user_password_confirmation'}= t(:password_confirmation)
         = f.password_field :password_confirmation
     = f.hidden_field :reset_password_token
     .row