diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 85f26c51b4..72b302c87f 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -770,11 +770,23 @@ tabs:
     settings-tab:
         panel_tabs:
             user_info_tab: true
+            user_config_tab: false
             user_quotas_tab: true
             group_quotas_tab: true
             user_accounting_tab: true
             user_showback_tab: true
         actions:
+            # The buttons inside the settings-tab panel user_info_tab are
+            # configured with users-tab/actions; User.update_password and
+            # User.login_token
+            #
+            # Buttons for user_config_tab
+            Settings.change_language: true
+            Settings.change_password: true
+            Settings.change_view: true
+            Settings.ssh_key: true
+            Settings.login_token: true
+            # Edit button in user_quotas_tab
             User.quotas_dialog: false
     upgrade-top-tab:
         panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index 17411fdb4c..088c62b251 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -770,11 +770,23 @@ tabs:
     settings-tab:
         panel_tabs:
             user_info_tab: true
+            user_config_tab: false
             user_quotas_tab: true
             group_quotas_tab: true
             user_accounting_tab: true
             user_showback_tab: true
         actions:
+            # The buttons inside the settings-tab panel user_info_tab are
+            # configured with users-tab/actions; User.update_password and
+            # User.login_token
+            #
+            # Buttons for user_config_tab
+            Settings.change_language: true
+            Settings.change_password: true
+            Settings.change_view: true
+            Settings.ssh_key: true
+            Settings.login_token: true
+            # Edit button in user_quotas_tab
             User.quotas_dialog: false
     upgrade-top-tab:
         panel_tabs:
diff --git a/src/sunstone/etc/sunstone-views/cloud.yaml b/src/sunstone/etc/sunstone-views/cloud.yaml
index e61f737682..17e8f85911 100644
--- a/src/sunstone/etc/sunstone-views/cloud.yaml
+++ b/src/sunstone/etc/sunstone-views/cloud.yaml
@@ -85,8 +85,18 @@ tabs:
             user_accounting_tab: true
             user_showback_tab: true
         actions:
+            # The buttons inside the settings-tab panel user_info_tab are
+            # configured with users-tab/actions; User.update_password and
+            # User.login_token
+            #
+            # Buttons for user_config_tab
+            Settings.change_language: true
+            Settings.change_password: true
+            Settings.change_view: true
+            Settings.ssh_key: true
+            Settings.login_token: true
+            # Edit button in user_quotas_tab
             User.quotas_dialog: false
-    # Buttons inside the settings-tab panel user_info_tab
     users-tab:
         actions:
             User.update_password: true
diff --git a/src/sunstone/etc/sunstone-views/cloud_vcenter.yaml b/src/sunstone/etc/sunstone-views/cloud_vcenter.yaml
index 59dbcd4d6c..b7fcdf8251 100644
--- a/src/sunstone/etc/sunstone-views/cloud_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/cloud_vcenter.yaml
@@ -85,8 +85,18 @@ tabs:
             user_accounting_tab: true
             user_showback_tab: true
         actions:
+            # The buttons inside the settings-tab panel user_info_tab are
+            # configured with users-tab/actions; User.update_password and
+            # User.login_token
+            #
+            # Buttons for user_config_tab
+            Settings.change_language: true
+            Settings.change_password: true
+            Settings.change_view: true
+            Settings.ssh_key: true
+            Settings.login_token: true
+            # Edit button in user_quotas_tab
             User.quotas_dialog: false
-    # Buttons inside the settings-tab panel user_info_tab
     users-tab:
         actions:
             User.update_password: true
diff --git a/src/sunstone/etc/sunstone-views/groupadmin.yaml b/src/sunstone/etc/sunstone-views/groupadmin.yaml
index 33488bddd0..cc5e8dd708 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin.yaml
@@ -770,9 +770,21 @@ tabs:
     settings-tab:
         panel_tabs:
             user_info_tab: true
+            user_config_tab: false
             user_quotas_tab: true
             group_quotas_tab: true
             user_accounting_tab: true
             user_showback_tab: true
         actions:
-            User.quotas_dialog: false
+            # The buttons inside the settings-tab panel user_info_tab are
+            # configured with users-tab/actions; User.update_password and
+            # User.login_token
+            #
+            # Buttons for user_config_tab
+            Settings.change_language: true
+            Settings.change_password: true
+            Settings.change_view: true
+            Settings.ssh_key: true
+            Settings.login_token: true
+            # Edit button in user_quotas_tab
+            User.quotas_dialog: false
\ No newline at end of file
diff --git a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
index 30c082ba90..ea6bc4704c 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
@@ -771,9 +771,21 @@ tabs:
     settings-tab:
         panel_tabs:
             user_info_tab: true
+            user_config_tab: false
             user_quotas_tab: true
             group_quotas_tab: true
             user_accounting_tab: true
             user_showback_tab: true
         actions:
-            User.quotas_dialog: false
+            # The buttons inside the settings-tab panel user_info_tab are
+            # configured with users-tab/actions; User.update_password and
+            # User.login_token
+            #
+            # Buttons for user_config_tab
+            Settings.change_language: true
+            Settings.change_password: true
+            Settings.change_view: true
+            Settings.ssh_key: true
+            Settings.login_token: true
+            # Edit button in user_quotas_tab
+            User.quotas_dialog: false
\ No newline at end of file
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index e4b4426ba7..2c9f0b86f3 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -775,9 +775,20 @@ tabs:
     settings-tab:
         panel_tabs:
             user_info_tab: true
+            user_config_tab: false
             user_quotas_tab: true
             group_quotas_tab: true
             user_accounting_tab: true
             user_showback_tab: true
+        # The buttons inside the settings-tab panel user_info_tab are
+        # configured with users-tab/actions; User.update_password and
+        # User.login_token
         actions:
-            User.quotas_dialog: false
+            # Buttons for user_config_tab
+            Settings.change_language: true
+            Settings.change_password: true
+            Settings.change_view: true
+            Settings.ssh_key: true
+            Settings.login_token: true
+            # Edit button in user_quotas_tab
+            User.quotas_dialog: false
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs
index 8c71e29df0..f2b0826e12 100644
--- a/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs
+++ b/src/sunstone/public/app/tabs/settings-tab/panels/user-config/html.hbs
@@ -15,149 +15,126 @@
 {{! -------------------------------------------------------------------------- }}
 
 <div class="row">
-  <div class="large-6 columns">
-    <div class="row">
-      <div class="large-12 large-centered columns">
-        <dl class="accordion" data-accordion>
-          <dd class="accordion-item" data-accordion-item>
-            <a href="#provision_update_language_accordion" class="text-center accordion-title">
-              <div class="row only-not-active">
-                <div class="large-12 large-centered columns">
-                  <div class="text-center">
-                    <span class="fa-stack fa-3x"> <i class="fa fa-cloud fa-stack-2x"></i> <i class="fa fa-comments fa-stack-1x fa-inverse"></i>
-                    </span>
-                  </div>
-                </div>
+  {{#isTabActionEnabled "settings-tab" "Settings.change_language"}}
+  <div class="medium-6 columns end">
+    <dl class="accordion" data-accordion>
+      <dd class="accordion-item" data-accordion-item>
+        <a href="#provision_update_language_accordion" class="text-center accordion-title">
+          <div class="text-center only-not-active">
+            <span class="fa-stack fa-3x"> <i class="fa fa-cloud fa-stack-2x"></i> <i class="fa fa-comments fa-stack-1x fa-inverse"></i>
+            </span>
+          </div>
+          <br class="only-not-active">
+          <i class="fa fa-lg fa-comments only-active"></i>
+          {{tr "Change Language"}}
+        </a>
+        <div id="provision_update_language_accordion" class="accordion-content" data-tab-content>
+          <br>
+          <form id="provision_change_language_form">
+            <div class="row">
+              <div class="large-12 columns">
+                <select type="language" id="provision_new_language" class="provision-input">{{{languageOptions}}}</select>
               </div>
-              <br class="only-not-active">
-              <i class="fa fa-lg fa-comments only-active"></i>
-              {{tr "Change Language"}}
-            </a>
-            <div id="provision_update_language_accordion" class="accordion-content" data-tab-content>
-              <br>
-              <form id="provision_change_language_form">
-                <div class="row">
-                  <div class="large-12 columns">
-                    <select type="language" id="provision_new_language" class="provision-input">{{{languageOptions}}}</select>
-                  </div>
-                </div>
-                <div class="row">
-                  <div class="large-12 columns">
-                    <button href"#" type="submit" class="button large radius large-12 small-12">{{tr "Update Language"}}</button>
-                  </div>
-                </div>
-              </form>
             </div>
-          </dd>
-        </dl>
-      </div>
-    </div>
-  </div>
-  <div class="large-6 columns">
-    <div class="row">
-      <div class="large-12 large-centered columns">
-        <dl class="accordion" data-accordion>
-          <dd class="accordion-item" data-accordion-item>
-            <a href="#provision_update_password_accordion" class="text-center accordion-title">
-              <div class="row only-not-active">
-                <div class="large-12 large-centered columns">
-                  <div class="text-center">
-                    <span class="fa-stack fa-3x">
-                      <i class="fa fa-cloud fa-stack-2x"></i>
-                      <i class="fa fa-lock fa-stack-1x fa-inverse"></i>
-                    </span>
-                  </div>
-                </div>
+            <div class="row">
+              <div class="large-12 columns">
+                <button href"#" type="submit" class="button large radius large-12 small-12">{{tr "Update Language"}}</button>
               </div>
-              <br class="only-not-active">
-              <i class="fa fa-lg fa-lock only-active"></i>
-              {{tr "Change Password"}}
-            </a>
-            <div id="provision_update_password_accordion" class="accordion-content" data-tab-content>
-              <br>
-              <form id="provision_change_password_form">
-                <div class="row">
-                  <div class="large-12 columns">
-                    <input type="password" id="provision_new_password" class="provision-input" placeholder="{{tr "New Password"}}"/>
-                  </div>
-                </div>
-                <div class="row">
-                  <div class="large-12 columns">
-                    <input type="password" id="provision_new_confirm_password" class="provision-input" placeholder="{{tr "Confirm Password"}}"/>
-                  </div>
-                </div>
-                <div class="row">
-                  <div class="large-12 columns">
-                    <button href"#" type="submit" class="button large radius large-12 small-12">{{tr "Update Password"}}</button>
-                  </div>
-                </div>
-              </form>
             </div>
-          </dd>
-        </dl>
-      </div>
-    </div>
+          </form>
+        </div>
+      </dd>
+    </dl>
   </div>
+  {{/isTabActionEnabled}}
+  {{#isTabActionEnabled "settings-tab" "Settings.change_password"}}
+  <div class="medium-6 columns end">
+    <dl class="accordion" data-accordion>
+      <dd class="accordion-item" data-accordion-item>
+        <a href="#provision_update_password_accordion" class="text-center accordion-title">
+          <div class="text-center only-not-active">
+            <span class="fa-stack fa-3x">
+              <i class="fa fa-cloud fa-stack-2x"></i>
+              <i class="fa fa-lock fa-stack-1x fa-inverse"></i>
+            </span>
+          </div>
+          <br class="only-not-active">
+          <i class="fa fa-lg fa-lock only-active"></i>
+          {{tr "Change Password"}}
+        </a>
+        <div id="provision_update_password_accordion" class="accordion-content" data-tab-content>
+          <br>
+          <form id="provision_change_password_form">
+            <div class="row">
+              <div class="large-12 columns">
+                <input type="password" id="provision_new_password" class="provision-input" placeholder="{{tr "New Password"}}"/>
+              </div>
+            </div>
+            <div class="row">
+              <div class="large-12 columns">
+                <input type="password" id="provision_new_confirm_password" class="provision-input" placeholder="{{tr "Confirm Password"}}"/>
+              </div>
+            </div>
+            <div class="row">
+              <div class="large-12 columns">
+                <button href"#" type="submit" class="button large radius large-12 small-12">{{tr "Update Password"}}</button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </dd>
+    </dl>
+  </div>
+  {{/isTabActionEnabled}}
 </div>
-<br>
-<br>
 <div class="row">
-  <div class="large-6 columns">
-    <div class="row">
-      <div class="large-12 large-centered columns">
-        <dl class="accordion" data-accordion>
-          <dd class="accordion-item" data-accordion-item>
-            <a href="#provision_update_view_accordion" class="text-center accordion-title">
-              <div class="row only-not-active">
-                <div class="large-12 large-centered columns">
-                  <div class="text-center">
-                    <span class="fa-stack fa-3x">
-                      <i class="fa fa-cloud fa-stack-2x"></i>
-                      <i class="fa fa-picture-o fa-stack-1x fa-inverse"></i>
-                    </span>
-                  </div>
-                </div>
+  {{#isTabActionEnabled "settings-tab" "Settings.change_view"}}
+  <div class="medium-6 columns end">
+    <dl class="accordion" data-accordion>
+      <dd class="accordion-item" data-accordion-item>
+        <a href="#provision_update_view_accordion" class="text-center accordion-title">
+          <div class="text-center only-not-active">
+            <span class="fa-stack fa-3x">
+              <i class="fa fa-cloud fa-stack-2x"></i>
+              <i class="fa fa-picture-o fa-stack-1x fa-inverse"></i>
+            </span>
+          </div>
+          <br class="only-not-active">
+          <i class="fa fa-lg fa-picture-o only-active"></i>
+          {{tr "Change view"}}
+        </a>
+        <div id="provision_update_view_accordion" class="accordion-content" data-tab-content>
+          <br>
+          <form id="provision_change_view_form">
+            <div class="row">
+              <div class="large-12 columns">
+                <select id="provision_user_views_select" class="provision-input"></select>
               </div>
-              <br class="only-not-active">
-              <i class="fa fa-lg fa-picture-o only-active"></i>
-              {{tr "Change view"}}
-            </a>
-            <div id="provision_update_view_accordion" class="accordion-content" data-tab-content>
-              <br>
-              <form id="provision_change_view_form">
-                <div class="row">
-                  <div class="large-12 columns">
-                    <select id="provision_user_views_select" class="provision-input"></select>
-                  </div>
-                </div>
-                <div class="row">
-                  <div class="large-12 columns">
-                    <button href"#" type="submit" class="button large radius large-12 small-12">{{tr "Update view"}}</button>
-                  </div>
-                </div>
-              </form>
             </div>
-          </dd>
-        </dl>
-      </div>
-    </div>
+            <div class="row">
+              <div class="large-12 columns">
+                <button href"#" type="submit" class="button large radius large-12 small-12">{{tr "Update view"}}</button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </dd>
+    </dl>
   </div>
-  <div class="large-6 columns">
+  {{/isTabActionEnabled}}
+  {{#isTabActionEnabled "settings-tab" "Settings.ssh_key"}}
+  <div class="medium-6 columns end">
     <form id="provision_add_ssh_key_form">
       <div class="row">
         <div class="large-12 large-centered columns">
           <dl class="accordion" data-accordion>
             <dd class="accordion-item" data-accordion-item>
               <a href="#provision_add_ssh_key_accordion" class="text-center accordion-title">
-                <div class="row only-not-active">
-                  <div class="large-12 large-centered columns">
-                    <div class="text-center">
-                      <span class="fa-stack fa-3x">
-                        <i class="fa fa-cloud fa-stack-2x"></i>
-                        <i class="fa fa-key fa-stack-1x fa-inverse"></i>
-                      </span>
-                    </div>
-                  </div>
+                <div class="text-center only-not-active">
+                  <span class="fa-stack fa-3x">
+                    <i class="fa fa-cloud fa-stack-2x"></i>
+                    <i class="fa fa-key fa-stack-1x fa-inverse"></i>
+                  </span>
                 </div>
                 <br class="only-not-active">
                 <i class="fa fa-key fa-lg only-active"></i>
@@ -196,23 +173,21 @@
       </div>
     </form>
   </div>
+  {{/isTabActionEnabled}}
 </div>
 <div class="row">
-  <div class="large-6 columns">
+  {{#isTabActionEnabled "settings-tab" "Settings.login_token"}}
+  <div class="medium-6 columns end">
     <div class="row">
       <div class="large-12 large-centered columns">
         <dl class="accordion" data-accordion>
           <dd class="accordion-item" data-accordion-item>
             <a href="#provision_login_token_accordion" class="text-center accordion-title">
-              <div class="row only-not-active">
-                <div class="large-12 large-centered columns">
-                  <div class="text-center">
-                    <span class="fa-stack fa-3x">
-                      <i class="fa fa-cloud fa-stack-2x"></i>
-                      <i class="fa fa-unlock-alt fa-stack-1x fa-inverse"></i>
-                    </span>
-                  </div>
-                </div>
+              <div class="text-center only-not-active">
+                <span class="fa-stack fa-3x">
+                  <i class="fa fa-cloud fa-stack-2x"></i>
+                  <i class="fa fa-unlock-alt fa-stack-1x fa-inverse"></i>
+                </span>
               </div>
               <br class="only-not-active">
               <i class="fa fa-lg fa-unlock-alt only-active"></i>
@@ -247,4 +222,5 @@
       </div>
     </div>
   </div>
+  {{/isTabActionEnabled}}
 </div>
\ No newline at end of file