diff --git a/app/controllers/spree/users_controller.rb b/app/controllers/spree/users_controller.rb
index f524f8d465..c6ce064b57 100644
--- a/app/controllers/spree/users_controller.rb
+++ b/app/controllers/spree/users_controller.rb
@@ -59,7 +59,7 @@ module Spree
       if @user
         authorize! params[:action].to_sym, @user
       else
-        redirect_to spree.login_path
+        redirect_to main_app.login_path
       end
     end
 
diff --git a/app/controllers/user_passwords_controller.rb b/app/controllers/user_passwords_controller.rb
index e467e915e2..9200b9b6ef 100644
--- a/app/controllers/user_passwords_controller.rb
+++ b/app/controllers/user_passwords_controller.rb
@@ -10,7 +10,7 @@ class UserPasswordsController < Spree::UserPasswordsController
 
     if resource.errors.empty?
       set_flash_message(:success, :send_instructions) if is_navigational_format?
-      respond_with resource, location: spree.login_path
+      respond_with resource, location: main_app.login_path
     else
       respond_to do |format|
         format.html do
diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index ca5993aca5..4d3fde45d6 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -15,7 +15,6 @@ Spree::Core::Engine.routes.draw do
   resources :users, :only => [:edit, :update]
 
   devise_scope :spree_user do
-    get '/login' => 'user_sessions#new', :as => :login
     post '/login' => 'user_sessions#create', :as => :create_new_session
     get '/logout' => 'user_sessions#destroy', :as => :logout
     get '/signup' => 'user_registrations#new', :as => :signup
diff --git a/lib/spree/authentication_helpers.rb b/lib/spree/authentication_helpers.rb
index 49bd97542a..1f26c65f2c 100644
--- a/lib/spree/authentication_helpers.rb
+++ b/lib/spree/authentication_helpers.rb
@@ -11,7 +11,9 @@ module Spree
       current_spree_user
     end
 
-    delegate :login_path, to: :spree, prefix: true
+    def spree_login_path
+      main_app.login_path
+    end
 
     delegate :signup_path, to: :spree, prefix: true