diff --git a/app/controllers/spree/users_controller.rb b/app/controllers/spree/users_controller.rb
index 1028022c67..7961b5548b 100644
--- a/app/controllers/spree/users_controller.rb
+++ b/app/controllers/spree/users_controller.rb
@@ -34,11 +34,6 @@ module Spree
     def create
       @user = Spree::User.new(user_params)
       if @user.save
-
-        if current_order
-          session[:guest_token] = nil
-        end
-
         redirect_back_or_default(main_app.root_url)
       else
         render :new
diff --git a/lib/spree/core/controller_helpers/order.rb b/lib/spree/core/controller_helpers/order.rb
index 1f9fe80827..3aea7c853d 100644
--- a/lib/spree/core/controller_helpers/order.rb
+++ b/lib/spree/core/controller_helpers/order.rb
@@ -59,11 +59,9 @@ module Spree
 
         def associate_user
           @order ||= current_order
-          if spree_current_user && @order && (@order.user.blank? || @order.email.blank?)
-            @order.associate_user!(spree_current_user)
-          end
+          return unless spree_current_user && @order && (@order.user.blank? || @order.email.blank?)
 
-          session[:guest_token] = nil
+          @order.associate_user!(spree_current_user)
         end
 
         # Recover incomplete orders from other sessions after logging in.