diff --git a/static/js/services/plan-service.js b/static/js/services/plan-service.js
index 972b341ab..1c8da7f5f 100644
--- a/static/js/services/plan-service.js
+++ b/static/js/services/plan-service.js
@@ -277,17 +277,18 @@ function(KeyService, UserService, CookieService, ApiService, Features, Config) {
 
     var email = planService.getEmail(orgname);
     StripeCheckout.open({
-        key:         KeyService.stripePublishableKey,
-        address:     false,
-        email:       email,
-        currency:    'usd',
-        name:        'Update credit card',
-        description: 'Enter your credit card number',
-        panelLabel:  'Update',
-        token:       submitToken,
-        image:       'static/img/quay-icon-stripe.png',
-        opened:      function() { $scope.$apply(function() { callbacks['opened']() }); },
-        closed:      function() { $scope.$apply(function() { callbacks['closed']() }); }
+        key:            KeyService.stripePublishableKey,
+        email:          email,
+        currency:       'usd',
+        name:           'Update credit card',
+        description:    'Enter your credit card number',
+        panelLabel:     'Update',
+        token:          submitToken,
+        image:          'static/img/quay-icon-stripe.png',
+        billingAddress: true,
+        zipCode:        true,
+        opened:         function() { $scope.$apply(function() { callbacks['opened']() }); },
+        closed:         function() { $scope.$apply(function() { callbacks['closed']() }); }
      });
   };
 
@@ -358,18 +359,19 @@ function(KeyService, UserService, CookieService, ApiService, Features, Config) {
     planService.getPlan(planId, function(planDetails) {
       var email = planService.getEmail(orgname);
       StripeCheckout.open({
-        key:         KeyService.stripePublishableKey,
-        address:     false,
-        email:       email,
-        amount:      planDetails.price,
-        currency:    'usd',
-        name:        'Quay ' + planDetails.title + ' Subscription',
-        description: 'Up to ' + planDetails.privateRepos + ' private repositories',
-        panelLabel:  opt_title || 'Subscribe',
-        token:       submitToken,
-        image:       'static/img/quay-icon-stripe.png',
-        opened:      function() { $scope.$apply(function() { callbacks['opened']() }); },
-        closed:      function() { $scope.$apply(function() { callbacks['closed']() }); }
+        key:            KeyService.stripePublishableKey,
+        email:          email,
+        amount:         planDetails.price,
+        currency:       'usd',
+        name:           'Quay ' + planDetails.title + ' Subscription',
+        description:    'Up to ' + planDetails.privateRepos + ' private repositories',
+        panelLabel:     opt_title || 'Subscribe',
+        token:          submitToken,
+        image:          'static/img/quay-icon-stripe.png',
+        billingAddress: true,
+        zipCode:        true,
+        opened:         function() { $scope.$apply(function() { callbacks['opened']() }); },
+        closed:         function() { $scope.$apply(function() { callbacks['closed']() }); }
       });
     });
   };