diff --git a/generators/clearance_features/templates/features/step_definitions/clearance_steps.rb b/generators/clearance_features/templates/features/step_definitions/clearance_steps.rb
index 349abb281..c57f8e57e 100644
--- a/generators/clearance_features/templates/features/step_definitions/clearance_steps.rb
+++ b/generators/clearance_features/templates/features/step_definitions/clearance_steps.rb
@@ -28,17 +28,14 @@
 
 Then /^I should be signed in$/ do
   assert_not_nil request.session[:user_id]
-  assert_not_nil request.session[:salt]
 end
 
 Then /^I should not be signed in$/ do
   assert_nil request.session[:user_id]
-  assert_nil request.session[:salt]
 end
 
 When /^session is cleared$/ do
   request.session[:user_id] = nil
-  request.session[:salt]    = nil
 end
 
 # Emails
diff --git a/lib/clearance/app/controllers/application_controller.rb b/lib/clearance/app/controllers/application_controller.rb
index 6c4297d31..411162654 100644
--- a/lib/clearance/app/controllers/application_controller.rb
+++ b/lib/clearance/app/controllers/application_controller.rb
@@ -26,8 +26,8 @@ def authenticate
             end
 
             def user_from_session
-              if session[:user_id] && session[:salt]
-                user = User.find_by_id_and_salt(session[:user_id], session[:salt])
+              if session[:user_id]
+                user = User.find_by_id(session[:user_id])
                 user && user.email_confirmed? ? user : nil                
               end
             end
@@ -47,7 +47,6 @@ def sign_user_in(user)
             def sign_in(user)
               if user
                 session[:user_id] = user.id
-                session[:salt]    = user.salt
               end
             end
 
diff --git a/lib/clearance/test/test_helper.rb b/lib/clearance/test/test_helper.rb
index d6afed157..4f4f63964 100644
--- a/lib/clearance/test/test_helper.rb
+++ b/lib/clearance/test/test_helper.rb
@@ -11,13 +11,11 @@ def sign_in_as(user = nil)
               user.confirm_email!
             end
             @request.session[:user_id] = user.id
-            @request.session[:salt]    = user.salt
             return user
           end
 
           def sign_out 
             @request.session[:user_id] = nil
-            @request.session[:salt]    = nil
           end
           
         end
diff --git a/shoulda_macros/clearance.rb b/shoulda_macros/clearance.rb
index e41485e99..8efe6f5ee 100644
--- a/shoulda_macros/clearance.rb
+++ b/shoulda_macros/clearance.rb
@@ -10,8 +10,6 @@ def should_be_signed_in_as(&block)
           "please pass a User. try: should_be_signed_in_as { @user }"
         assert_equal user.id,   session[:user_id], 
           "session[:user_id] is not set to User's id"
-        assert_equal user.salt, session[:salt], 
-          "session[:salt] is not set to User's salt"
       end
     end
 
@@ -30,7 +28,6 @@ def should_be_signed_in_and_email_confirmed_as(&block)
     def should_not_be_signed_in
       should "not be signed in" do
         assert_nil session[:user_id]
-        assert_nil session[:salt]
       end
     end