diff --git a/apps/dashboard/src/main/java/com/akto/action/CustomAuthTypeAction.java b/apps/dashboard/src/main/java/com/akto/action/CustomAuthTypeAction.java
index 41d3eca1eb..2b6eebd0ee 100644
--- a/apps/dashboard/src/main/java/com/akto/action/CustomAuthTypeAction.java
+++ b/apps/dashboard/src/main/java/com/akto/action/CustomAuthTypeAction.java
@@ -104,15 +104,11 @@ public void run() {
     }
 
     public String updateCustomAuthTypeStatus(){
-        User user = getSUser();
         customAuthType = CustomAuthTypeDao.instance.findOne(CustomAuthType.NAME,name);
         if(customAuthType==null){
             addActionError("Custom Auth Type does not exist");
             return ERROR.toUpperCase();
-        } else if(user.getId()!=customAuthType.getCreatorId()){
-            addActionError("Unautherized Request");
-            return ERROR.toUpperCase();
-        }  else {
+        } else {
             CustomAuthTypeDao.instance.updateOne(Filters.eq(CustomAuthType.NAME, name),
                     Updates.combine(
                         Updates.set(CustomAuthType.ACTIVE, active),
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/ContextualLayout.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/ContextualLayout.jsx
index db5f542b78..79a567fb44 100644
--- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/ContextualLayout.jsx
+++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/ContextualLayout.jsx
@@ -12,20 +12,20 @@ function ContextualLayout(props){
         url: '#',
         accessibilityLabel: 'Akto Icon',
       };
-    
+    const disabledActive = isDisabled()
     const contextualMarkup = (
     <ContextualSaveBar
             message="Unsaved changes"
             saveAction={{
             onAction: () => saveAction(),
             loading: false,
-            disabled: isDisabled(),
+            disabled: disabledActive,
             content: "Save"
             }}
             discardAction={{
             onAction: () => discardAction(),
             content: "Discard",
-            disabled: isDisabled(),
+            disabled: disabledActive,
             }}
         />
     )
@@ -33,7 +33,7 @@ function ContextualLayout(props){
     return (
         <div className='control-frame-padding'>
           <Frame logo={logo}>
-            {contextualMarkup}
+            {!disabledActive ? contextualMarkup : null}
             {pageMarkup}
           </Frame>
         </div>