diff --git a/Gemfile b/Gemfile
index 2a1b1bcf05..b526c0f07e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'nokogiri', '>= 1.6.7.1'
 gem 'pg'
 gem 'spree', github: 'openfoodfoundation/spree', branch: 'spree-upgrade-step-3'
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '1-3-stable'
+gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch: 'spree-upgrade-intermediate'
 
 # Our branch contains two changes
 # - Pass customer email and phone number to PayPal (merged to upstream master)
diff --git a/Gemfile.lock b/Gemfile.lock
index fd3f28abc2..2b7e656337 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,6 +92,18 @@ GIT
     spree_sample (1.3.99)
       spree_core (= 1.3.99)
 
+GIT
+  remote: git://github.com/openfoodfoundation/spree_auth_devise.git
+  revision: da9eecefc6fe13dedf4c6f3febec79caad839ec3
+  branch: spree-upgrade-intermediate
+  specs:
+    spree_auth_devise (2.0.0)
+      devise (~> 2.2.5)
+      devise-encryptable (= 0.1.2)
+      spree_backend (~> 1.3.6)
+      spree_core (~> 1.3.6)
+      spree_frontend (~> 1.3.6)
+
 GIT
   remote: git://github.com/spree/deface.git
   revision: 1110a1336252109bce7f98f9182042e0bc2930ae
@@ -102,17 +114,6 @@ GIT
       nokogiri (~> 1.6.0)
       rails (>= 3.1)
 
-GIT
-  remote: git://github.com/spree/spree_auth_devise.git
-  revision: ba95589a85368297c844f096c2a0c121e5b08138
-  branch: 1-3-stable
-  specs:
-    spree_auth_devise (1.3.0)
-      cancan (~> 1.6.7)
-      devise (~> 2.2.3)
-      devise-encryptable (= 0.1.2)
-      spree_core
-
 GIT
   remote: git://github.com/spree/spree_i18n.git
   revision: 752eb67204e9c5a4e22b62591a8fd55fe2285e43
@@ -193,7 +194,7 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    bcrypt (3.1.7)
+    bcrypt (3.1.11)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.4.5)
@@ -664,7 +665,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-    warden (1.2.3)
+    warden (1.2.6)
       rack (>= 1.0)
     webmock (1.8.11)
       addressable (>= 2.2.7)