diff --git a/src/app/organization/organizationSettingsController.js b/src/app/organization/organizationSettingsController.js
index 7b5b3c6dd36..df08f98a440 100644
--- a/src/app/organization/organizationSettingsController.js
+++ b/src/app/organization/organizationSettingsController.js
@@ -10,7 +10,12 @@
                 $scope.model = {
                     name: org.Name,
                     billingEmail: org.BillingEmail,
-                    businessName: org.BusinessName
+                    businessName: org.BusinessName,
+                    businessAddress1: org.BusinessAddress1,
+                    businessAddress2: org.BusinessAddress2,
+                    businessAddress3: org.BusinessAddress3,
+                    businessCountry: org.BusinessCountry,
+                    businessTaxNumber: org.BusinessTaxNumber
                 };
             });
         });
diff --git a/src/app/organization/views/organizationSettings.html b/src/app/organization/views/organizationSettings.html
index e73360da0cc..7894248570e 100644
--- a/src/app/organization/views/organizationSettings.html
+++ b/src/app/organization/views/organizationSettings.html
@@ -25,15 +25,28 @@
                             <input type="text" id="name" name="Name" ng-model="model.name" class="form-control"
                                    required api-field ng-readonly="selfHosted" />
                         </div>
+                        <div class="form-group" show-errors>
+                            <label for="name">Billing Email</label>
+                            <input type="email" id="billingEmail" name="BillingEmail" ng-model="model.billingEmail"
+                                   class="form-control" required api-field ng-readonly="selfHosted" />
+                        </div>
                         <div class="form-group" show-errors>
                             <label for="name">Business Name</label>
                             <input type="text" id="businessName" name="BusinessName" ng-model="model.businessName"
                                    class="form-control" api-field ng-readonly="selfHosted" />
                         </div>
-                        <div class="form-group" show-errors>
-                            <label for="name">Billing Email</label>
-                            <input type="email" id="billingEmail" name="BillingEmail" ng-model="model.billingEmail"
-                                   class="form-control" required api-field ng-readonly="selfHosted" />
+                        <div ng-if="!selfHosted">
+                            <hr />
+                            <strong>Tax Information</strong>
+                            <div>{{model.businessAddress1}}</div>
+                            <div>{{model.businessAddress2}}</div>
+                            <div>{{model.businessAddress3}}</div>
+                            <div>{{model.businessCountry}}</div>
+                            <div>{{model.businessTaxNumber}}</div>
+                            <p class="help-block">
+                                Please <a href="https://bitwarden.com/contact/" target="_blank">contact support</a>
+                                to provide (or update) tax information for your invoices.
+                            </p>
                         </div>
                     </div>
                     <div class="col-sm-3 settings-photo">
diff --git a/src/app/settings/settingsCreateOrganizationController.js b/src/app/settings/settingsCreateOrganizationController.js
index 902b9ed3af8..4cc07cdc04a 100644
--- a/src/app/settings/settingsCreateOrganizationController.js
+++ b/src/app/settings/settingsCreateOrganizationController.js
@@ -113,6 +113,7 @@
                             additionalStorageGb: model.additionalStorageGb,
                             billingEmail: model.billingEmail,
                             businessName: model.ownedBusiness ? model.businessName : null,
+                            country: $scope.paymentMethod === 'card' ? model.card.address_country : null,
                             collectionName: defaultCollectionCt
                         };