diff --git a/src/app/constants.js b/src/app/constants.js
index 77dffe75ea..6e1c59aa06 100644
--- a/src/app/constants.js
+++ b/src/app/constants.js
@@ -120,5 +120,14 @@ angular.module('bit')
                 annualPlanType: 'enterpriseAnnually',
                 upgradeSortOrder: 3
             }
+        },
+        storageGb: {
+            price: 0.33,
+            monthlyPrice: 0.50,
+            yearlyPrice: 4
+        },
+        premium: {
+            price: 10,
+            yearlyPrice: 10
         }
     });
diff --git a/src/app/organization/organizationBillingController.js b/src/app/organization/organizationBillingController.js
index 6703e8e807..796e90195a 100644
--- a/src/app/organization/organizationBillingController.js
+++ b/src/app/organization/organizationBillingController.js
@@ -103,6 +103,17 @@
                     seats: org.Seats
                 };
 
+                $scope.storage = null;
+                if ($scope && org.MaxStorageGb) {
+                    $scope.storage = {
+                        currentGb: org.StorageGb || 0,
+                        maxGb: org.MaxStorageGb,
+                        currentName: org.StorageName || '0 GB'
+                    };
+
+                    $scope.storage.percentage = +($scope.storage.currentGb / $scope.storage.maxGb).toFixed(2);
+                }
+
                 $scope.subscription = null;
                 if (org.Subscription) {
                     $scope.subscription = {
diff --git a/src/app/organization/views/organizationBilling.html b/src/app/organization/views/organizationBilling.html
index 7d6ff2cf46..14c6ebe277 100644
--- a/src/app/organization/views/organizationBilling.html
+++ b/src/app/organization/views/organizationBilling.html
@@ -99,6 +99,32 @@
             </button>
         </div>
     </div>
+    <div class="box box-default" ng-if="storage">
+        <div class="box-header with-border">
+            <h3 class="box-title">Storage</h3>
+        </div>
+        <div class="box-body">
+            <p>
+                You plan has a total of {{storage.maxGb}} GB of encrypted file storage.
+                You are currently using {{storage.currentName}}.
+            </p>
+            <div class="progress" style="margin: 0;">
+                <div class="progress-bar progress-bar-info" role="progressbar"
+                     aria-valuenow="{{storage.percentage}}" aria-valuemin="0" aria-valuemax="1"
+                     style="min-width: 50px; width: {{storage.percentage}}%;">
+                    {{storage.percentage}}%
+                </div>
+            </div>
+        </div>
+        <div class="box-footer">
+            <button type="button" class="btn btn-default btn-flat" ng-click="adjustStorage(true)">
+                Add Storage
+            </button>
+            <button type="button" class="btn btn-default btn-flat" ng-click="adjustStorage(false)">
+                Remove Storage
+            </button>
+        </div>
+    </div>
     <div class="box box-default">
         <div class="box-header with-border">
             <h3 class="box-title">Payment Method</h3>
diff --git a/src/app/services/authService.js b/src/app/services/authService.js
index d8bb9be523..a7787db4f3 100644
--- a/src/app/services/authService.js
+++ b/src/app/services/authService.js
@@ -217,6 +217,15 @@ angular
             });
         };
 
+        _service.updateProfilePremium = function (isPremium) {
+            return _service.getUserProfile().then(function (profile) {
+                if (profile) {
+                    profile.premium = isPremium;
+                    _userProfile = profile;
+                }
+            });
+        };
+
         _service.isAuthenticated = function () {
             return tokenService.getToken() !== null;
         };
diff --git a/src/app/settings/settingsBillingController.js b/src/app/settings/settingsBillingController.js
index 4aa1aac704..c55b75d396 100644
--- a/src/app/settings/settingsBillingController.js
+++ b/src/app/settings/settingsBillingController.js
@@ -87,6 +87,17 @@
 
                 var i = 0;
 
+                $scope.storage = null;
+                if (billing && billing.MaxStorageGb) {
+                    $scope.storage = {
+                        currentGb: billing.StorageGb || 0,
+                        maxGb: billing.MaxStorageGb,
+                        currentName: billing.StorageName || '0 GB'
+                    };
+
+                    $scope.storage.percentage = +($scope.storage.currentGb / $scope.storage.maxGb).toFixed(2);
+                }
+
                 $scope.subscription = null;
                 if (billing && billing.Subscription) {
                     $scope.subscription = {
diff --git a/src/app/settings/settingsCreateOrganizationController.js b/src/app/settings/settingsCreateOrganizationController.js
index e479a85b45..52227332c6 100644
--- a/src/app/settings/settingsCreateOrganizationController.js
+++ b/src/app/settings/settingsCreateOrganizationController.js
@@ -4,21 +4,25 @@
     .controller('settingsCreateOrganizationController', function ($scope, $state, apiService, cryptoService,
         toastr, $analytics, authService, stripe, constants) {
         $scope.plans = constants.plans;
+        $scope.storageGb = constants.storageGb;
 
         $scope.model = {
             plan: 'free',
             additionalSeats: 0,
             interval: 'year',
-            ownedBusiness: false
+            ownedBusiness: false,
+            additionalStorageGb: null
         };
 
         $scope.totalPrice = function () {
             if ($scope.model.interval === 'month') {
-                return ($scope.model.additionalSeats || 0) * ($scope.plans[$scope.model.plan].monthlySeatPrice || 0) +
+                return (($scope.model.additionalSeats || 0) * ($scope.plans[$scope.model.plan].monthlySeatPrice || 0)) +
+                    (($scope.model.additionalStorageGb || 0) * $scope.storageGb.monthlyPrice) +
                     ($scope.plans[$scope.model.plan].monthlyBasePrice || 0);
             }
             else {
-                return ($scope.model.additionalSeats || 0) * ($scope.plans[$scope.model.plan].annualSeatPrice || 0) +
+                return (($scope.model.additionalSeats || 0) * ($scope.plans[$scope.model.plan].annualSeatPrice || 0)) +
+                    (($scope.model.additionalStorageGb || 0) * $scope.storageGb.yearlyPrice) +
                     ($scope.plans[$scope.model.plan].annualBasePrice || 0);
             }
         };
@@ -65,6 +69,7 @@
                         key: shareKeyCt,
                         paymentToken: response.id,
                         additionalSeats: model.additionalSeats,
+                        additionalStorageGb: model.additionalStorageGb,
                         billingEmail: model.billingEmail,
                         businessName: model.ownedBusiness ? model.businessName : null
                     };
diff --git a/src/app/settings/settingsPremiumController.js b/src/app/settings/settingsPremiumController.js
index 589d5f24f7..0fabff8f17 100644
--- a/src/app/settings/settingsPremiumController.js
+++ b/src/app/settings/settingsPremiumController.js
@@ -1,15 +1,16 @@
 angular
     .module('bit.settings')
 
-    .controller('settingsPremiumController', function ($scope, $state, apiService, toastr, $analytics, authService, stripe) {
+    .controller('settingsPremiumController', function ($scope, $state, apiService, toastr, $analytics, authService, stripe,
+        constants) {
         authService.getUserProfile().then(function (profile) {
             if (profile.premium) {
                 return $state.go('backend.user.settingsBilling');
             }
         });
 
-        $scope.storageGbPrice = 4;
-        $scope.premiumPrice = 10;
+        $scope.storageGbPrice = constants.storageGb.yearlyPrice;
+        $scope.premiumPrice = constants.premium.price;
 
         $scope.model = {
             additionalStorageGb: null
@@ -28,6 +29,8 @@
 
                 return apiService.accounts.postPremium(request).$promise;
             }).then(function (result) {
+                return authService.updateProfilePremium(true);
+            }).then(function () {
                 $analytics.eventTrack('Signed Up Premium');
                 return authService.refreshAccessToken();
             }).then(function () {
diff --git a/src/app/settings/views/settingsBilling.html b/src/app/settings/views/settingsBilling.html
index 526c43e161..1a9cc55518 100644
--- a/src/app/settings/views/settingsBilling.html
+++ b/src/app/settings/views/settingsBilling.html
@@ -8,7 +8,7 @@
         </div>
         <div class="box-body">
             <div class="row">
-                <div class="col-md-6">
+                <div class="col-md-5">
                     <dl>
                         <dt>Status</dt>
                         <dd style="text-transform: capitalize;">{{(subscription && subscription.status) || '-'}}</dd>
@@ -16,7 +16,7 @@
                         <dd>{{nextInvoice ? ((nextInvoice.date | date: format: mediumDate) + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}</dd>
                     </dl>
                 </div>
-                <div class="col-md-6">
+                <div class="col-md-7">
                     <strong>Details</strong>
                     <div ng-show="loading">
                         Loading...
@@ -48,16 +48,20 @@
             </button>
         </div>
     </div>
-    <div class="box box-default">
+    <div class="box box-default" ng-if="storage">
         <div class="box-header with-border">
             <h3 class="box-title">Storage</h3>
         </div>
         <div class="box-body">
-            <p>You membership has a total of x GB of encrypted file storage. You are currently using y GB.</p>
+            <p>
+                You membership has a total of {{storage.maxGb}} GB of encrypted file storage.
+                You are currently using {{storage.currentName}}.
+            </p>
             <div class="progress" style="margin: 0;">
                 <div class="progress-bar progress-bar-info" role="progressbar"
-                     aria-valuenow="0.56" aria-valuemin="0" aria-valuemax="1" style="min-width: 2em; width: 56%;">
-                    56%
+                     aria-valuenow="{{storage.percentage}}" aria-valuemin="0" aria-valuemax="1"
+                     style="min-width: 50px; width: {{storage.percentage}}%;">
+                    {{storage.percentage}}%
                 </div>
             </div>
         </div>
diff --git a/src/app/settings/views/settingsCreateOrganization.html b/src/app/settings/views/settingsCreateOrganization.html
index 1738b1084e..e3603600f0 100644
--- a/src/app/settings/views/settingsCreateOrganization.html
+++ b/src/app/settings/views/settingsCreateOrganization.html
@@ -75,6 +75,7 @@
                         <span>For personal users such as families &amp; friends.</span>
                         <span>- Add and share with up to 10 users (5 included with base price)</span>
                         <span>- Create unlimited collections</span>
+                        <span>- 1 GB encrypted file storage</span>
                         <span>- Priority customer support</span>
                         <span>- 7 day free trial, cancel anytime</span>
                         <span class="bottom-line">
@@ -90,6 +91,7 @@
                         <span>For businesses and other team organizations.</span>
                         <span>- Add and share with unlimited users</span>
                         <span>- Create unlimited collections</span>
+                        <span>- 1 GB encrypted file storage</span>
                         <span>- Priority customer support</span>
                         <span>- 7 day free trial, cancel anytime</span>
                         <span class="bottom-line">
@@ -105,6 +107,7 @@
                         <span>For businesses and other large organizations.</span>
                         <span>- Add and share with unlimited users</span>
                         <span>- Create unlimited collections</span>
+                        <span>- 1 GB encrypted file storage</span>
                         <span>- Control user access with groups</span>
                         <span>- Sync your users and groups from a directory (AD, Azure AD, GSuite, LDAP)</span>
                         <span>- Priority customer support</span>
@@ -166,6 +169,27 @@
                 </div>
             </div>
         </div>
+        <div class="box box-default" ng-if="!plans[model.plan].noPayment">
+            <div class="box-header with-border">
+                <h3 class="box-title">Additional Storage</h3>
+            </div>
+            <div class="box-body">
+                <div class="form-group" show-errors style="margin: 0;">
+                    <p>
+                        Your plan comes with 1 GB of encrypted file storage. You can add additional
+                        storage for {{storageGb.price | currency:"$":2}} per GB /month.
+                    </p>
+                    <div class="row">
+                        <div class="col-md-4">
+                            <label for="additionalStorage" class="sr-only">Storage</label>
+                            <input type="number" id="additionalStorage" name="AdditionalStorageGb"
+                                   ng-model="model.additionalStorageGb" min="0" max="99" step="1" class="form-control"
+                                   placeholder="# of additional GB" api-field />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
         <div class="box box-default" ng-if="!plans[model.plan].noPayment">
             <div class="box-header with-border">
                 <h3 class="box-title">Billing Summary</h3>
@@ -187,6 +211,12 @@
                             &times;12 mo. =
                             {{((model.additionalSeats || 0) * plans[model.plan].annualSeatPrice) | currency:"$":2}} /year
                         </span>
+                        <span>
+                            Additional storage:
+                            {{model.additionalStorageGb || 0}} GB &times; {{storageGb.price | currency:"$":2}}
+                            &times;12 mo. =
+                            {{(model.additionalStorageGb || 0) * storageGb.yearlyPrice | currency:"$":2}} /year
+                        </span>
                     </label>
                 </div>
                 <div class="radio radio-block" ng-if="model.plan !== 'personal'">
@@ -204,6 +234,11 @@
                             &times;{{plans[model.plan].monthlySeatPrice | currency:"$":2}} =
                             {{((model.additionalSeats || 0) * plans[model.plan].monthlySeatPrice) | currency:"$":2}} /month
                         </span>
+                        <span>
+                            Additional storage:
+                            {{model.additionalStorageGb || 0}} GB &times; {{storageGb.monthlyPrice | currency:"$":2}} =
+                            {{(model.additionalStorageGb || 0) * storageGb.monthlyPrice | currency:"$":2}} /month
+                        </span>
                     </label>
                 </div>
             </div>
diff --git a/src/app/settings/views/settingsPremium.html b/src/app/settings/views/settingsPremium.html
index 633128f541..9de164df9b 100644
--- a/src/app/settings/views/settingsPremium.html
+++ b/src/app/settings/views/settingsPremium.html
@@ -64,9 +64,9 @@
                 <h3 class="box-title">Billing Summary</h3>
             </div>
             <div class="box-body">
-                Premium Membership:
+                Premium membership:
                 {{premiumPrice | currency:"$"}}<br />
-                Additional Storage:
+                Additional storage:
                 {{model.additionalStorageGb || 0}} GB &times; {{storageGbPrice | currency:"$"}} =
                 {{(model.additionalStorageGb || 0) * storageGbPrice | currency:"$"}}
             </div>