diff --git a/Gemfile b/Gemfile
index 795551a5..ccaf50c4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "http://gemcutter.org"
 
 gem "rails", "3.0.0.beta"
-gem "warden", "0.9.3"
+gem "warden", "0.9.4"
 gem "sqlite3-ruby", :require => "sqlite3"
 gem "webrat", "0.7"
 gem "mocha", :require => false
@@ -15,4 +15,4 @@ group :mongo_mapper do
   gem "mongo",        "0.18.3"
   gem "mongo_ext",    "0.18.3", :require => false
   gem "mongo_mapper", :git => "git://github.com/merbjedi/mongomapper.git", :branch => "rails3"
-end
\ No newline at end of file
+end
diff --git a/Rakefile b/Rakefile
index 3035132a..b32b0cc7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -45,7 +45,7 @@ begin
     s.authors = ['José Valim', 'Carlos Antônio']
     s.files =  FileList["[A-Z]*", "{app,config,lib}/**/*"]
     s.extra_rdoc_files = FileList["[A-Z]*"] - %w(Gemfile Rakefile)
-    s.add_dependency("warden", "~> 0.9.3")
+    s.add_dependency("warden", "~> 0.9.4")
   end
 
   Jeweler::GemcutterTasks.new
diff --git a/devise.gemspec b/devise.gemspec
index 9a5dd259..a158f547 100644
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jos\303\251 Valim", "Carlos Ant\303\264nio"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-02-23}
   s.description = %q{Flexible authentication solution for Rails with Warden}
   s.email = %q{contact@plataformatec.com.br}
   s.extra_rdoc_files = [
@@ -171,12 +171,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<warden>, ["~> 0.9.3"])
+      s.add_runtime_dependency(%q<warden>, ["~> 0.9.4"])
     else
-      s.add_dependency(%q<warden>, ["~> 0.9.3"])
+      s.add_dependency(%q<warden>, ["~> 0.9.4"])
     end
   else
-    s.add_dependency(%q<warden>, ["~> 0.9.3"])
+    s.add_dependency(%q<warden>, ["~> 0.9.4"])
   end
 end
 
diff --git a/test/integration/rememberable_test.rb b/test/integration/rememberable_test.rb
index a7bbe748..087c8fdb 100644
--- a/test/integration/rememberable_test.rb
+++ b/test/integration/rememberable_test.rb
@@ -28,6 +28,14 @@ class RememberMeTest < ActionController::IntegrationTest
     assert warden.user(:user) == user
   end
 
+  test 'does not remember other scopes' do
+    user = create_user_and_remember
+    get root_path
+    assert_response :success
+    assert warden.authenticated?(:user)
+    assert_not warden.authenticated?(:admin)
+  end
+
   test 'do not remember with invalid token' do
     user = create_user_and_remember('add')
     get users_path
diff --git a/test/rails_app/app/views/layouts/application.html.erb b/test/rails_app/app/views/layouts/application.html.erb
index 045e6067..c0e51507 100644
--- a/test/rails_app/app/views/layouts/application.html.erb
+++ b/test/rails_app/app/views/layouts/application.html.erb
@@ -14,6 +14,10 @@
         <p>Hello User <%= current_user.email %>! You are signed in!</p>
       <% end -%>
 
+      <% if admin_signed_in? -%>
+        <p>Hello Admin <%= current_admin.email %>! You are signed in!</p>
+      <% end -%>
+
       <%= yield %>
     </div>
   </body>