diff --git a/src/views/users.html b/src/views/users.html
index 75a5adefa..6debd871c 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -527,7 +527,7 @@
 
   <div class="card card-large" ng-show="user.isAtLeastAdmin">
     <form name="directoryConfigForm" role="form" novalidate ng-submit="directoryConfig.submit()" autocomplete="off">
-      <fieldset>
+      <fieldset ng-disabled="directoryConfig.busy || !config.features.directoryConfig">
         <div class="checkbox">
           <label>
             <input type="checkbox" ng-model="directoryConfig.editableUserProfiles">&nbsp;&nbsp;Allow users to edit their name &amp; email <sup><a ng-href="{{ config.webServerOrigin }}/documentation/user-management/#lock-profile" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
@@ -543,12 +543,15 @@
 
     <br/>
 
-    <div class="row">
-      <div class="col-md-8">
-        <span ng-hide="config.features.directoryConfig">Directory configuration is only available is only available in the paid plans. <a href="" ng-click="openSubscriptionSetup()">Setup Subscription Now</a></span>
+    <div class="row" ng-hide="config.features.directoryConfig">
+      <div class="col-md-12">
+        <span>These features are only available in the paid plans. <a href="" class="pull-right" ng-click="openSubscriptionSetup()">Setup Subscription Now</a></span>
       </div>
-      <div class="col-md-4">
-        <button class="btn btn-outline btn-primary pull-right" ng-click="directoryConfig.submit()" ng-disabled="!directoryConfigForm.$dirty || directoryConfig.busy || !config.features.directoryConfig">
+    </div>
+
+    <div class="row" ng-show="config.features.directoryConfig">
+      <div class="col-md-12">
+        <button class="btn btn-outline btn-primary pull-right" ng-click="directoryConfig.submit()" ng-disabled="!directoryConfigForm.$dirty || directoryConfig.busy">
           <i class="fa fa-circle-notch fa-spin" ng-show="directoryConfig.busy"></i> Save
         </button>
       </div>