diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts
index 4bfd8979..9edd7a57 100644
--- a/packages/admin.gbapp/dialogs/AdminDialog.ts
+++ b/packages/admin.gbapp/dialogs/AdminDialog.ts
@@ -366,7 +366,9 @@ export class AdminDialog extends IGBDialog {
 
       if (!result && min.instance.params) {
         const params = JSON.parse(min.instance.params);
-        return list.includes(params['Can Publish']);
+        if (params){
+          return list.includes(params['Can Publish']);
+        }
       }
       return result;
     }
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index 9dd0a6dc..1010c890 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -487,7 +487,7 @@ export class GBMinService {
             await this.adminService.setValue(instance.instanceId, 'accessToken', token['accessToken']);
             await this.adminService.setValue(instance.instanceId, 'refreshToken', token['refreshToken']);
             await this.adminService.setValue(instance.instanceId, 'expiresOn', token['expiresOn'].toString());
-            await this.adminService.setValue(instance.instanceId, 'AntiCSRFAttackState', undefined);
+            await this.adminService.setValue(instance.instanceId, 'AntiCSRFAttackState', null);
 
             // Inform the home for default .gbui after finishing token retrival.