diff --git a/src/views/users.html b/src/views/users.html
index 3d9a555b7..631822b68 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -1,3 +1,21 @@
+<!-- Modal subscription -->
+<div class="modal fade" id="subscriptionRequiredModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title">Paid subscription required</h4>
+      </div>
+      <div class="modal-body">
+        <p>To add more users, a paid subscription is required.</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-success pull-left" ng-click="openSubscriptionSetup()">Setup Subscription</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Modal add user -->
 <div class="modal fade" id="userAddModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
@@ -373,7 +391,7 @@
   <div class="text-left">
     <h1>
       Users
-      <button class="btn btn-primary btn-outline pull-right" ng-click="useradd.show()" ng-disabled="config.features.userMaxCount && config.features.userMaxCount <= allUsers.length" uib-tooltip="{{ config.features.userMaxCount && config.features.userMaxCount <= allUsers.length ? 'Please upgrade to add more users.': '' }}" tooltip-class="long nowrap" tooltip-placement="left">
+      <button class="btn btn-primary btn-outline pull-right" ng-click="useradd.show()">
         <i class="fa fa-user-plus"></i> New User
       </button>
     </h1>
diff --git a/src/views/users.js b/src/views/users.js
index ff48d5bce..0e89d1265 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -102,6 +102,11 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         role: 'user',
 
         show: function () {
+            if ($scope.config.features.userMaxCount && $scope.config.features.userMaxCount <= $scope.allUsers.length) {
+                $('#subscriptionRequiredModal').modal('show');
+                return;
+            }
+
             $scope.useradd.error = {};
             $scope.useradd.email = '';
             $scope.useradd.username = '';