diff --git a/Step/wwwroot/src/modules/nc-softkeys.vue b/Step/wwwroot/src/modules/nc-softkeys.vue
index 0fb891ea..98ef6714 100644
--- a/Step/wwwroot/src/modules/nc-softkeys.vue
+++ b/Step/wwwroot/src/modules/nc-softkeys.vue
@@ -70,7 +70,6 @@ export default {
       return false;
     },
     isKeyActive(id) {
-
       if(this.checkSecurityDisabled('ncSoftkeys')) return false;
 
       let r = this.$store.getters.getNcSoftKeyStatus(id);
diff --git a/Step/wwwroot/src/modules/under-the-hood/soft-key1.vue b/Step/wwwroot/src/modules/under-the-hood/soft-key1.vue
index 0ecde505..eccce52a 100644
--- a/Step/wwwroot/src/modules/under-the-hood/soft-key1.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/soft-key1.vue
@@ -42,6 +42,8 @@ export default {
     },
     disabled() {
       var _disabled = true;
+
+      if(this.checkSecurityDisabled('userSoftkeys')) return true;
       for (const key in this.activeSubKeys) {
         if (this.activeSubKeys[key]) _disabled = false;
       }
diff --git a/Step/wwwroot/src/modules/under-the-hood/soft-key2.vue b/Step/wwwroot/src/modules/under-the-hood/soft-key2.vue
index 2c57e8bd..a86ad766 100644
--- a/Step/wwwroot/src/modules/under-the-hood/soft-key2.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/soft-key2.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="soft-key" :class="{ disabled: disabled, selected: selected}">
+  <div class="soft-key" :class="{ disabled: disabled || checkSecurityDisabled('userSoftkeys'), selected: selected}">
  <header>{{title}}</header>
     <div class="detail">
       <button class="star" :class="{active: starred}" @click="toggleStar()"><i class="fa fa-star"></i></button>
@@ -37,7 +37,7 @@ export default {
     this.ischecked = this.checked;
   },
   methods: {
-    toggleCheck() {      
+    toggleCheck() {
       this.$emit("checkChanged");
       this.$forceUpdate();
     },
diff --git a/Step/wwwroot/src/modules/under-the-hood/soft-key3.vue b/Step/wwwroot/src/modules/under-the-hood/soft-key3.vue
index bcc57deb..6163d4a2 100644
--- a/Step/wwwroot/src/modules/under-the-hood/soft-key3.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/soft-key3.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="soft-key command" :class="{disabled: disabled, selected: selected, active: active}">
+  <div class="soft-key command" :class="{disabled: disabled || checkSecurityDisabled('userSoftkeys'), selected: selected, active: active}">
 
     <div class="detail no-title">
       <button class="star" :class="{active: starred}" @click="toggleStar()"><i class="fa fa-star"></i></button>