diff --git a/octoprint_CalibrationTools/static/js/EStepsViewModel.js b/octoprint_CalibrationTools/static/js/EStepsViewModel.js
index 9027acb..0531c6f 100644
--- a/octoprint_CalibrationTools/static/js/EStepsViewModel.js
+++ b/octoprint_CalibrationTools/static/js/EStepsViewModel.js
@@ -15,7 +15,6 @@ $(function () {
             return self.generalVM.isSmall() ? "span8" : "span9";
         });
 
-        self.is_admin = ko.observable(false);
         self.steps = ko.observable();
         self.steps["X"] = ko.observable();
         self.steps["Y"] = ko.observable();
@@ -45,7 +44,6 @@ $(function () {
             self.testParam.extrudeLength(self.settingsViewModel.settings.plugins.CalibrationTools.eSteps.extrudeLength());
             self.testParam.extrudeSpeed(self.settingsViewModel.settings.plugins.CalibrationTools.eSteps.extrudeSpeed());
             self.testParam.markLength(self.settingsViewModel.settings.plugins.CalibrationTools.eSteps.markLength());
-            self.is_admin(self.loginStateViewModel.isAdmin());
         }
 
         self.from_json = function (response) {
diff --git a/octoprint_CalibrationTools/static/js/PIDTuneViewModel.js b/octoprint_CalibrationTools/static/js/PIDTuneViewModel.js
index 5034f04..bb3c7d2 100644
--- a/octoprint_CalibrationTools/static/js/PIDTuneViewModel.js
+++ b/octoprint_CalibrationTools/static/js/PIDTuneViewModel.js
@@ -69,7 +69,6 @@ $(function () {
             self.pid.bed.index(-1);
             self.pid.bed.noCycles(self.settingsViewModel.settings.plugins.CalibrationTools.pid.bed.noCycles());
             self.pid.bed.targetTemp(self.settingsViewModel.settings.plugins.CalibrationTools.pid.bed.targetTemp());
-            self.isAdmin(self.loginStateViewModel.isAdmin());
         }
 
         self.startPidHotEnd = function () {
diff --git a/octoprint_CalibrationTools/static/js/XYZStepsViewModel.js b/octoprint_CalibrationTools/static/js/XYZStepsViewModel.js
index 6050cc2..dee0e96 100644
--- a/octoprint_CalibrationTools/static/js/XYZStepsViewModel.js
+++ b/octoprint_CalibrationTools/static/js/XYZStepsViewModel.js
@@ -89,7 +89,6 @@ $(function () {
             self.eStepsXYZ.printedCubeSize.Y(self.settingsViewModel.settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.Y());
             self.eStepsXYZ.printedCubeSize.Z(self.settingsViewModel.settings.plugins.CalibrationTools.XYZSteps.gCodeCubeSize.Z());
 
-            self.isAdmin(self.loginStateViewModel.isAdmin());
         }
     }
     OCTOPRINT_VIEWMODELS.push({
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
index a55d901..9139223 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-esteps.jinja2
@@ -64,7 +64,7 @@ reliable.
     <div data-bind="class: $root.columnLabelCls()"></div>
     <div data-bind="class: $root.columnFieldCls()">
         <button class="btn btn-success"
-            data-bind="click: $root.startExtrusion, enable: !$root.startExtrusionActive() && $root.is_admin() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
+            data-bind="click: $root.startExtrusion, enable: !$root.startExtrusionActive() && $root.loginStateViewModel.isAdmin() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
             title="This will trigger M90, M83, G1 E100 F50, M82, G90 in order for extruding filament">
             <i class="fas fa-play" style="color:false" data-color="false"></i>&nbsp&nbsp
             Start extrusion
@@ -84,7 +84,8 @@ reliable.
         <div class="input-append">
             <input type="number" id="eSteps" title="Current value for number of steps/mm for E axe in EEPROM" class="input-small" step="0.01" data-bind="value: $root.steps.E(), enable:false">
             <span class="add-on" title="Current value for number of steps/mm for E axe in EEPROM">steps/mm</span>
-            <button class="btn" data-bind="click: $root.loadESteps, enable: $root.loadEStepsActive() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
+            <button class="btn"
+                data-bind="click: $root.loadESteps, enable: $root.loginStateViewModel.isAdmin() && $root.loadEStepsActive() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
                 title="Loads current value of steps/mm from EEPROM by calling M92">
                 <i class="fas fa-sync-alt" style="color:false" data-color="false"></i>
             </button>
@@ -114,7 +115,7 @@ reliable.
 <div class="row-fluid" style="margin-bottom: 5px;">
     <div data-bind="class: $root.columnLabelCls()"></div>
     <div data-bind="class: $root.columnFieldCls()">
-        <button class="btn btn-primary" data-bind="click: $root.saveESteps, enable: $root.is_admin() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
+        <button class="btn btn-primary" data-bind="click: $root.saveESteps, enable: $root.loginStateViewModel.isAdmin() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
             title="Saves the new calculated value of steps/mm on printer EEPROM">
             <i class="fas fa-save" data-color="#000000"></i>&nbsp&nbsp
             Save the new value
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
index ea65c90..cac1900 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-pid.jinja2
@@ -56,7 +56,8 @@ prefer to start this process with the hot end at room temperature.",
     </div>
     <div data-bind="class: $root.columnFieldCls()">
         <div class="input-prepend input-append" id="bedPid">
-            <button class="btn" data-bind="click: $root.getCurrentValues, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())" title="Load current PIDs">
+            <button class="btn" data-bind="click: $root.getCurrentValues, enable: $root.loginStateViewModel.isAdmin() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
+                title="Load current PIDs">
                 <i class="fas fa-sync-alt" style="color:false" data-color="false"></i>&nbsp&nbsp
                 Get current values
             </button>
@@ -103,7 +104,7 @@ prefer to start this process with the hot end at room temperature.",
 <div class="row-fluid" style="margin-bottom: 5px;">
     <div data-bind="class: $root.columnLabelCls()"></div>
     <div data-bind="class: $root.columnFieldCls()">
-        <button class="btn btn-success" data-bind="click: $root.startPidHotEnd, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
+        <button class="btn btn-success" data-bind="click: $root.startPidHotEnd, enable: $root.loginStateViewModel.isAdmin() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
             title="This will trigger PID auto tuning (M106 Sx; M303 Ex Sx U1; M500)">
             <i class="fas fa-play" style="color:false" data-color="false"></i>&nbsp&nbsp
             Start hot-end PID auto-tunning
@@ -150,7 +151,7 @@ prefer to start this process with the hot end at room temperature.",
 <div class="row-fluid" style="margin-bottom: 5px;">
     <div data-bind="class: $root.columnLabelCls()"></div>
     <div data-bind="class: $root.columnFieldCls()">
-        <button class="btn btn-success" data-bind="click: $root.startPidBed, enable: $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
+        <button class="btn btn-success" data-bind="click: $root.startPidBed, enable: $root.loginStateViewModel.isAdmin() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
             title="This will trigger PID auto tuning (M303 E-1 Sx U1; M500)">
             <i class="fas fa-play" style="color:false" data-color="false"></i>&nbsp&nbsp
             Start bed PID auto-tunning
diff --git a/octoprint_CalibrationTools/templates/tabs/tab-xyz.jinja2 b/octoprint_CalibrationTools/templates/tabs/tab-xyz.jinja2
index cfef5bb..e5e88c3 100644
--- a/octoprint_CalibrationTools/templates/tabs/tab-xyz.jinja2
+++ b/octoprint_CalibrationTools/templates/tabs/tab-xyz.jinja2
@@ -26,7 +26,8 @@ sized.","<a href='https://teachingtechyt.github.io/calibration.html#xyzsteps' ta
             <input type="number" id="" class="input-small numberDisplay" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.currentSteps.Y, enable: false">
             <span class="add-on" title="">&nbsp;&nbsp;&nbsp;Z</span>
             <input type="number" id="" class="input-small numberDisplay" step="0.001" min="0" max="100" title="" data-bind="value: $root.eStepsXYZ.currentSteps.Z, enable: false">
-            <button class="btn" data-bind="click: $root.loadESteps, enable: $root.loadEStepsActive() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
+            <button class="btn"
+                data-bind="click: $root.loadESteps, enable: $root.loginStateViewModel.isAdmin() && $root.loadEStepsActive() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
                 title="Loads current value from EEPROM by calling M92">
                 <i class="fas fa-sync-alt" style="color:false" data-color="false"></i>
             </button>
@@ -91,7 +92,8 @@ sized.","<a href='https://teachingtechyt.github.io/calibration.html#xyzsteps' ta
 <div class="row-fluid" style="margin-bottom: 5px;">
     <div data-bind="class: $root.columnLabelCls()"></div>
     <div data-bind="class: $root.columnFieldCls()">
-        <button class="btn btn-success" data-bind="click: $root.saveEStepsXYZ, enable: $root.saveEStepsXYZActive() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
+        <button class="btn btn-success"
+            data-bind="click: $root.saveEStepsXYZ, enable: $root.loginStateViewModel.isAdmin() && $root.saveEStepsXYZActive() && $root.controlViewModel.isOperational() && (!$root.controlViewModel.isPrinting())"
             title="This will save new values to EEPROM (M92 Xx Yx Zx; M500)">
             <i class="fas fa-save" style="color:false" data-color="false"></i>&nbsp&nbsp
             Save to EEPROM