diff --git a/src/app/organization/organizationDashboardController.js b/src/app/organization/organizationDashboardController.js
index c230858b39..f7ff2e8897 100644
--- a/src/app/organization/organizationDashboardController.js
+++ b/src/app/organization/organizationDashboardController.js
@@ -1,7 +1,9 @@
 angular
     .module('bit.organization')
 
-    .controller('organizationDashboardController', function ($scope, authService, $state) {
+    .controller('organizationDashboardController', function ($scope, authService, $state, appSettings) {
+        $scope.selfHosted = appSettings.selfHosted;
+
         $scope.$on('$viewContentLoaded', function () {
             authService.getUserProfile().then(function (userProfile) {
                 if (!userProfile.organizations) {
@@ -10,4 +12,8 @@
                 $scope.orgProfile = userProfile.organizations[$state.params.orgId];
             });
         });
+
+        $scope.goBilling = function () {
+            $state.go('backend.org.billing', { orgId: $state.params.orgId })
+        };
     });
diff --git a/src/app/organization/views/organizationDashboard.html b/src/app/organization/views/organizationDashboard.html
index be3edc186d..7e6e89c61b 100644
--- a/src/app/organization/views/organizationDashboard.html
+++ b/src/app/organization/views/organizationDashboard.html
@@ -7,10 +7,12 @@
 <section class="content">
     <div class="callout callout-warning" ng-if="!orgProfile.enabled">
         <h4><i class="fa fa-warning"></i> Organization Disabled</h4>
-        <p>
-            This organization is currently disabled. Users will not see your shared logins or collections.
-            Contact us if you would like to reinstate this organization.
-        </p>
+        <p>This organization is currently disabled. Users will not see your shared logins or collections.</p>
+        <p ng-if="!selfHosted">Contact us if you would like to reinstate this organization.</p>
+        <p ng-if="selfHosted">Update your license to reinstate this organization.</p>
+        <a ng-if="selfHosted" class="btn btn-default btn-flat" href="#" stop-click ng-click="goBilling()">
+            Billing &amp; Licensing
+        </a>
         <a class="btn btn-default btn-flat" href="https://bitwarden.com/contact/" target="_blank">
             Contact Us
         </a>