diff --git a/auth/app/models/order_decorator.rb b/auth/app/models/order_decorator.rb
index 75bb2161f85..c454ec3541e 100644
--- a/auth/app/models/order_decorator.rb
+++ b/auth/app/models/order_decorator.rb
@@ -1,4 +1,6 @@
 Order.class_eval do
+  delegate :token, :to => :user
+
   # Associates the specified user with the order and destroys any previous association with guest user if
   # necessary.
   def associate_user!(user)
@@ -8,10 +10,6 @@ def associate_user!(user)
     save(:validate => false)
   end
 
-  def token
-    user.token if user.anonymous?
-  end
-
   validates_format_of :email, :with => Authlogic::Regex.email, :if => :require_email
 
 end
diff --git a/auth/spec/models/order_spec.rb b/auth/spec/models/order_spec.rb
index bcc74ed0e0b..fb16c50df06 100644
--- a/auth/spec/models/order_spec.rb
+++ b/auth/spec/models/order_spec.rb
@@ -3,16 +3,11 @@
 describe Order do
   let(:order) { Order.new }
   context "#token" do
-    it "should be the same as the user's token when the user is a guest" do
+    it "should be the same as the user's token" do
       user = mock_model(User, :anonymous? => true, :token => "foo")
       order.user = user
       order.token.should == user.token
     end
-    it "should be nil when the user is registered" do
-      user = mock_model(User, :anonymous? => false, :token => "foo")
-      order.user = user
-      order.token.should be_nil
-    end
   end
   context "#associate_user!" do
     let(:user) { mock_model User, :anonymous? => false, :email => 'spree@example.com' }