diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/dashboard.js b/src/sunstone/public/app/tabs/provision-tab/dashboard/dashboard.js
index d75c71b7b6..7d29b93b5d 100644
--- a/src/sunstone/public/app/tabs/provision-tab/dashboard/dashboard.js
+++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/dashboard.js
@@ -164,6 +164,9 @@ define(function(require) {
 
     function dashboard_quotas_running_vms(default_user_quotas, user){
       if(default_user_quotas.VM_QUOTA.VM.RUNNING_VMS){
+        if(!Config.isFeatureEnabled("cloud_vm_create")){
+          $(".provision_create_vm_button").hide();
+        }
         var vms = QuotaWidgets.quotaInfo(
           user.VM_QUOTA.VM.RUNNING_VMS_USED,
           user.VM_QUOTA.VM.RUNNING_VMS,
diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/html/quotas.hbs b/src/sunstone/public/app/tabs/provision-tab/dashboard/html/quotas.hbs
index e1bd2c9740..24fa29cbbe 100644
--- a/src/sunstone/public/app/tabs/provision-tab/dashboard/html/quotas.hbs
+++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/html/quotas.hbs
@@ -105,5 +105,8 @@
         </div>
       </div>
     </div>
+    <div class="large-11 medium-12 large-centered columns">
+      <a href"#" class="medium button success provision_create_vm_button"> <i class="fas fa-lg fa-plus-square"/></a>
+    </div>
   </div>
 </fieldset>
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/provision-tab/dashboard/html/vms.hbs b/src/sunstone/public/app/tabs/provision-tab/dashboard/html/vms.hbs
index 4dc62230e6..3bce388df4 100644
--- a/src/sunstone/public/app/tabs/provision-tab/dashboard/html/vms.hbs
+++ b/src/sunstone/public/app/tabs/provision-tab/dashboard/html/vms.hbs
@@ -45,7 +45,8 @@
           <div class="large-12 columns">
             <a href"#" class="medium button success provision_create_vm_button"> <i class="fas fa-lg fa-plus-square"/></a>
             <a href"#" class="medium button provision_vms_list_button">
-              <i class="fas fa-lg fa-th"/></a>
+              <i class="fas fa-lg fa-th"/>
+            </a>
           </div>
         </div>
       </div>
diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/vms.js b/src/sunstone/public/app/tabs/provision-tab/vms/vms.js
index 1d946d4df8..247d0b8b24 100644
--- a/src/sunstone/public/app/tabs/provision-tab/vms/vms.js
+++ b/src/sunstone/public/app/tabs/provision-tab/vms/vms.js
@@ -433,7 +433,13 @@ define(function(require) {
     });
 
       var tab = $("#"+TAB_ID);
-      ProvisionVmsList.generate($(".provision_vms_list_section"), {active: true});
+      ProvisionVmsList.generate(
+        $(".provision_vms_list_section"), 
+        {
+          active: true, 
+          create: Config.isFeatureEnabled("cloud_vm_create")
+        }
+      );
 
       //----------------------------------------------------------------------------
       // Boot order