diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index eb90094d48..affab70c16 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -7,7 +7,8 @@ class ApplicationController < ActionController::Base
 
 
   def after_sign_in_path_for(resource)
-    request.referer || root_path
+    referer_path = URI(request.referer).path 
+    [main_app.shop_checkout_path].include?(referer_path) ? referer_path : root_path
   end
 
   private
diff --git a/spec/features/consumer/authentication_spec.rb b/spec/features/consumer/authentication_spec.rb
new file mode 100644
index 0000000000..e1dd681af6
--- /dev/null
+++ b/spec/features/consumer/authentication_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+feature "Authentication", js: true do
+  describe "login" do
+    let(:user) { create(:user, password: "password", password_confirmation: "password") }
+    scenario "with valid credentials" do
+      visit "/login"
+      fill_in "Email", with: user.email
+      fill_in "Password", with: "password"
+      click_button "Login"
+      current_path.should == "/"
+    end
+
+    scenario "with invalid credentials" do
+      visit "/login"
+      fill_in "Email", with: user.email
+      fill_in "Password", with: "this isn't my password"
+      click_button "Login"
+      page.should have_content "Invalid email or password"
+    end
+  end
+end
+
diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb
index 1665483cc3..2859a91697 100644
--- a/spec/features/consumer/shopping/checkout_spec.rb
+++ b/spec/features/consumer/shopping/checkout_spec.rb
@@ -138,7 +138,6 @@ feature "As a consumer I want to check out my cart", js: true do
       end
 
       it "shows ship address forms when selected shipping method requires one" do
-        # Fancy Foundation Forms are weird
         choose(sm1.name)
         find("#ship_address").visible?.should be_true
       end