diff --git a/lib/session_methods.rb b/lib/session_methods.rb
index fa18809..b30aa83 100644
--- a/lib/session_methods.rb
+++ b/lib/session_methods.rb
@@ -44,7 +44,6 @@ def login_from_cookie(klass)
       if user && user.remember_token?
         if user.enabled
           self.current_user = user
-          session[:browser_token] = user.browser_token if class_name == "member"
           handle_remember_cookie! false, class_name # freshen cookie token (keeping date)
           return self.current_user
         else
diff --git a/spec/controllers/ticket_groups_controller_spec.rb b/spec/controllers/ticket_groups_controller_spec.rb
index 628f35c..e5185fb 100644
--- a/spec/controllers/ticket_groups_controller_spec.rb
+++ b/spec/controllers/ticket_groups_controller_spec.rb
@@ -19,7 +19,7 @@
     DatabaseCleaner.clean
   end
 
-  before(:each) { controller.stub!(:logged_in?).and_return true }
+  before(:each) { controller.stub(:logged_in?).and_return true }
 
   describe "GET 'index'" do
     it_behaves_like "a standard index action"
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 7dc63e0..11c6a4e 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -19,7 +19,7 @@
     DatabaseCleaner.clean
   end
 
-  before(:each) { controller.stub!(:logged_in?).and_return true }
+  before(:each) { controller.stub(:logged_in?).and_return true }
 
   describe "GET 'index'" do
     it_behaves_like "a standard index action"
diff --git a/spec/lib/session_methods_spec.rb b/spec/lib/session_methods_spec.rb
index 9973fc5..85a6d77 100644
--- a/spec/lib/session_methods_spec.rb
+++ b/spec/lib/session_methods_spec.rb
@@ -8,7 +8,7 @@ def action_name() end
   include RSpec::Rails::ControllerExampleGroup
 
   before do
-    stub!(:authenticate_with_http_basic).and_return nil
+    double(:authenticate_with_http_basic)
   end
 
   #This doesn't test anything!
@@ -17,7 +17,7 @@ def action_name() end
     before do
       @user = FactoryGirl.create(:user)
       login_as(@user)
-      stub!(:reset_session)
+      double(:reset_session)
     end
 
     it "should save id to session" do
@@ -30,7 +30,7 @@ def action_name() end
     before do
       @user = FactoryGirl.create(:user)
       login_as(@user)
-      stub!(:reset_session)
+      double(:reset_session)
     end
 
     it 'resets the session' do
@@ -46,7 +46,7 @@ def action_name() end
       current_user(User).should be_nil
     end
     it 'kills :id session' do
-      session.stub!(:[]=)
+      session
       session.should_receive(:[]=).with(:user_id, nil).at_least(:once)
       logout_killing_session!('user')
     end
@@ -67,7 +67,6 @@ def action_name() end
     before do
       @user = FactoryGirl.create(:user)
       login_as(@user)
-      stub!(:reset_session)
     end
 
     it 'does not reset the session' do
@@ -86,7 +85,7 @@ def action_name() end
     end
 
     it 'kills :id session' do
-      session.stub!(:[]=)
+      session.stub(:[]=)
       session.should_receive(:[]=).with(:user_id, nil).at_least(:once)
       logout_keeping_session!('user')
     end
@@ -119,7 +118,7 @@ def set_remember_token token, time
       session[:user_id] = nil
     end
     it 'logs in with cookie' do
-      stub!(:cookies).and_return({ :user_auth_token => 'hello!'})
+      cookies.stub('[]').with(:user_auth_token).and_return('hello!')
       logged_in?.should be_true
     end
 
@@ -136,9 +135,12 @@ def set_remember_token token, time
 
     it 'fails expired cookie login' do
       set_remember_token 'hello!', 5.minutes.ago
-      stub!(:cookies).and_return({ :auth_token => 'hello!' , :class => "User" })
+      cookies.stub('[]').with(:user_auth_token).and_return('hello!')
       logged_in?.should_not be_true
     end
   end
 
+  def reset_session
+  end
+
 end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index 6184929..c9dea26 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -18,7 +18,7 @@
 
     it "sends an email to everyone in the ticket group by default" do
     @delay = PostOffice
-    PostOffice.stub!(:delay).and_return(@delay)
+    PostOffice.stub(:delay).and_return(@delay)
     ticket_group = FactoryGirl.create(:ticket_group)
     user = FactoryGirl.create(:user,  :ticket_groups => [ticket_group])
     user2 = FactoryGirl.create(:user,  :ticket_groups => [ticket_group])
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index fb18cff..e055516 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -88,7 +88,7 @@
 
     it "should create a remember_token" do
       @user = FactoryGirl.create(:user)
-      User.stub!(:create_token).and_return("ABC")
+      User.stub(:create_token).and_return("ABC")
       lambda do
         @user.remember_me_until(Time.now + 3000)
       end.should change(@user, :remember_token).from(nil).to("ABC")
@@ -108,7 +108,7 @@
 
     it "should create a new remember_token" do
       @user = FactoryGirl.create(:user, :remember_token => "abc", :remember_token_expires_at => Time.now + 30000)
-      User.stub!(:create_token).and_return("DEF")
+      User.stub(:create_token).and_return("DEF")
       lambda do
         @user.refresh_token
       end.should change(@user, :remember_token).from("abc").to("DEF")
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1663a79..9ad290a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -47,7 +47,7 @@
   config.order = "random"
 
   def user_login
-    User.stub!(:create_hashed_password)
+    User.stub(:create_hashed_password)
     @user = FactoryGirl.create(:user)
     mark_as_logged_in(@user)
   end
diff --git a/spec/support/standard_shared_examples.rb b/spec/support/standard_shared_examples.rb
index 4031e4f..2f67830 100644
--- a/spec/support/standard_shared_examples.rb
+++ b/spec/support/standard_shared_examples.rb
@@ -62,7 +62,7 @@
 
     it "should create a new instance and assign it to an instance variable" do
       newitem = item.class.new
-      item.class.stub!(:new).and_return(newitem)
+      item.class.stub(:new).and_return(newitem)
       get :new, outer_params
       assigns[singular.to_sym].should == newitem
     end