diff --git a/app/controllers/registration_controller.rb b/app/controllers/registration_controller.rb
index d58b10bd0b..47a1537b57 100644
--- a/app/controllers/registration_controller.rb
+++ b/app/controllers/registration_controller.rb
@@ -2,7 +2,7 @@ require 'open_food_network/spree_api_key_loader'
 
 class RegistrationController < BaseController
   include OpenFoodNetwork::SpreeApiKeyLoader
-  before_filter :load_spree_api_key, only: :index
+  before_filter :load_spree_api_key, only: [:index, :store]
   before_filter :check_user, except: :authenticate
   layout 'registration'
 
diff --git a/app/views/layouts/registration.html.haml b/app/views/layouts/registration.html.haml
index 8946a27de1..d6122cdc3b 100644
--- a/app/views/layouts/registration.html.haml
+++ b/app/views/layouts/registration.html.haml
@@ -31,6 +31,6 @@
 
         %section{ role: "main" }
           = yield
-          
+
           #footer
     %loading
diff --git a/lib/open_food_network/spree_api_key_loader.rb b/lib/open_food_network/spree_api_key_loader.rb
index 36fa4b9961..5eb7236221 100644
--- a/lib/open_food_network/spree_api_key_loader.rb
+++ b/lib/open_food_network/spree_api_key_loader.rb
@@ -9,4 +9,4 @@ module OpenFoodNetwork
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/controllers/registration_controller_spec.rb b/spec/controllers/registration_controller_spec.rb
index 49efc005f6..13babdf89e 100644
--- a/spec/controllers/registration_controller_spec.rb
+++ b/spec/controllers/registration_controller_spec.rb
@@ -12,4 +12,28 @@ describe RegistrationController do
       response.should redirect_to registration_auth_path(anchor: "signup?after_login=/register/store")
     end
   end
+
+  describe "loading data when user is logged in" do
+    let!(:user) { double(:user) }
+
+    before do
+      controller.stub spree_current_user: user
+      user.stub spree_api_key: '12345'
+      user.stub last_incomplete_spree_order: nil
+    end
+
+    describe "index" do
+      it "loads the spree api key" do
+        get :index
+        expect(assigns(:spree_api_key)).to eq '12345'
+      end
+    end
+
+    describe "store" do
+      it "loads the spree api key" do
+        get :store
+        expect(assigns(:spree_api_key)).to eq '12345'
+      end
+    end
+  end
 end