diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index b13750484..2b58f5bb2 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -66,7 +66,7 @@
   # config.password_length = 6..20
 
   # Regex to use to validate the email address
-  config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
+  config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
 
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
diff --git a/spree_auth_devise.gemspec b/spree_auth_devise.gemspec
index 21aaec793..e660f3d03 100644
--- a/spree_auth_devise.gemspec
+++ b/spree_auth_devise.gemspec
@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_dependency 'spree_core'
-  s.add_dependency 'devise', '~> 2.0.4'
+  s.add_dependency 'devise', '~> 3.0.0'
   s.add_dependency 'cancan', '= 1.6.7'
 end