diff --git a/app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee b/app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee
index b4ace027dc..55d2a46b42 100644
--- a/app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee
+++ b/app/assets/javascripts/admin/subscriptions/controllers/details_controller.js.coffee
@@ -21,6 +21,7 @@ angular.module("admin.subscriptions").controller "DetailsController", ($scope, $
 
   $scope.loadCustomer = ->
     params = { id: $scope.subscription.customer_id }
+    params.ams_prefix = 'subscription' unless $scope.subscription.id
     $scope.customer = CustomerResource.get params, (response) ->
       for address in ['bill_address','ship_address']
         return unless response[address]
diff --git a/app/controllers/admin/customers_controller.rb b/app/controllers/admin/customers_controller.rb
index d57340b653..0e7eec1e90 100644
--- a/app/controllers/admin/customers_controller.rb
+++ b/app/controllers/admin/customers_controller.rb
@@ -24,7 +24,7 @@ module Admin
     end
 
     def show
-      render_as_json @customer
+      render_as_json @customer, ams_prefix: params[:ams_prefix]
     end
 
     def create
@@ -91,5 +91,9 @@ module Admin
       spree_current_user.admin? ||
         spree_current_user.enterprises.include?(@customer.enterprise)
     end
+
+    def ams_prefix_whitelist
+      [:subscription]
+    end
   end
 end
diff --git a/app/serializers/api/admin/subscription_customer_serializer.rb b/app/serializers/api/admin/subscription_customer_serializer.rb
new file mode 100644
index 0000000000..7533fbc93a
--- /dev/null
+++ b/app/serializers/api/admin/subscription_customer_serializer.rb
@@ -0,0 +1,20 @@
+module Api
+  module Admin
+    # Used by admin subscription form
+    # Searches for a ship and bill addresses for the customer
+    # where they are not already explicitly set
+    class SubscriptionCustomerSerializer < CustomerSerializer
+      def bill_address
+        finder.bill_address
+      end
+
+      def ship_address
+        finder.ship_address
+      end
+
+      def finder
+        @finder ||= OpenFoodNetwork::AddressFinder.new(object, object.email)
+      end
+    end
+  end
+end
diff --git a/spec/serializers/admin/subscription_customer_serializer_spec.rb b/spec/serializers/admin/subscription_customer_serializer_spec.rb
new file mode 100644
index 0000000000..af5d769804
--- /dev/null
+++ b/spec/serializers/admin/subscription_customer_serializer_spec.rb
@@ -0,0 +1,18 @@
+describe Api::Admin::SubscriptionCustomerSerializer do
+  let(:address) { build(:address) }
+  let(:customer) { build(:customer) }
+  let(:serializer) { Api::Admin::SubscriptionCustomerSerializer.new(customer) }
+  let(:finder_mock) { instance_double(OpenFoodNetwork::AddressFinder, bill_address: address, ship_address: address) }
+
+  before do
+    allow(serializer).to receive(:finder) { finder_mock }
+  end
+
+  it "serializes a customer " do
+    result = JSON.parse(serializer.to_json)
+    expect(result['email']).to eq customer.email
+    expect(result['ship_address']['id']).to be nil
+    expect(result['ship_address']['address1']).to eq address.address1
+    expect(result['ship_address']['firstname']).to eq address.firstname
+  end
+end