diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 58c7c446f..e8e8a55b6 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -146,6 +146,10 @@ Devise.setup do |config|
   # config.navigational_formats = [:html, :iphone]
   config.navigational_formats = [:"*/*", "*/*", :html, :mobile]
 
+  # Looks up user emails ignoring case
+  # for forgot password, sign up, sign in, etc
+  config.case_insensitive_keys = [:email]
+
   # ==> Warden configuration
   # If you want to use other strategies, that are not (yet) supported by Devise,
   # you can configure them inside the config.warden block. The example below
diff --git a/features/change_password.feature b/features/change_password.feature
index aef13d451..979cf3b2a 100644
--- a/features/change_password.feature
+++ b/features/change_password.feature
@@ -18,7 +18,7 @@ Feature: Change password
   Scenario: Reset my password
     Given a user with email "forgetful@users.net"
     Given I am on the new user password page
-    And I fill in "Email" with "forgetful@users.net"
+    And I fill in "Email" with "Forgetful@users.net"
     And I press "Send me reset password instructions"
     Then I should see "You will receive an email with instructions"
     And I follow the "Change my password" link from the last sent email