diff --git a/.env.example b/.env.example
index f3d5e3634..e4a935626 100644
--- a/.env.example
+++ b/.env.example
@@ -13,4 +13,4 @@ POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
 # VARIOUS
 ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
-JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
\ No newline at end of file
+JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
diff --git a/apps/client/src/app/components/admin-overview/admin-overview.component.ts b/apps/client/src/app/components/admin-overview/admin-overview.component.ts
index a8f03bcbe..5d1138be8 100644
--- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts
+++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts
@@ -76,7 +76,6 @@ import { takeUntil } from 'rxjs/operators';
 export class GfAdminOverviewComponent implements OnDestroy, OnInit {
   public couponDuration: StringValue = '14 days';
   public coupons: Coupon[];
-  public hasPermissionForAuthToken: boolean;
   public hasPermissionForSubscription: boolean;
   public hasPermissionForSystemMessage: boolean;
   public hasPermissionToSyncDemoUserAccount: boolean;
@@ -109,11 +108,6 @@ export class GfAdminOverviewComponent implements OnDestroy, OnInit {
         if (state?.user) {
           this.user = state.user;
 
-          this.hasPermissionForAuthToken = hasPermission(
-            this.info.globalPermissions,
-            permissions.enableAuthToken
-          );
-
           this.hasPermissionForSubscription = hasPermission(
             this.info.globalPermissions,
             permissions.enableSubscription
diff --git a/apps/client/src/app/pages/features/features-page.component.ts b/apps/client/src/app/pages/features/features-page.component.ts
index d89156d69..dc2dfaf42 100644
--- a/apps/client/src/app/pages/features/features-page.component.ts
+++ b/apps/client/src/app/pages/features/features-page.component.ts
@@ -24,7 +24,6 @@ import { Subject, takeUntil } from 'rxjs';
   templateUrl: './features-page.html'
 })
 export class GfFeaturesPageComponent implements OnDestroy {
-  public hasPermissionForAuthToken: boolean;
   public hasPermissionForSubscription: boolean;
   public hasPermissionToCreateUser: boolean;
   public info: InfoItem;
@@ -53,11 +52,6 @@ export class GfFeaturesPageComponent implements OnDestroy {
         }
       });
 
-    this.hasPermissionForAuthToken = hasPermission(
-      this.info?.globalPermissions,
-      permissions.enableAuthToken
-    );
-
     this.hasPermissionForSubscription = hasPermission(
       this.info?.globalPermissions,
       permissions.enableSubscription
diff --git a/apps/client/src/app/pages/features/features-page.html b/apps/client/src/app/pages/features/features-page.html
index 314de8677..d172347f7 100644
--- a/apps/client/src/app/pages/features/features-page.html
+++ b/apps/client/src/app/pages/features/features-page.html
@@ -309,7 +309,7 @@
       </div>
     </div>
   </div>
-  @if (!user && hasPermissionToCreateUser) {
+  @if (hasPermissionToCreateUser && !user) {
     <div class="row">
       <div class="col mt-3 text-center">
         <a
diff --git a/apps/client/src/app/pages/landing/landing-page.component.ts b/apps/client/src/app/pages/landing/landing-page.component.ts
index 91ddc3ce6..55f07a798 100644
--- a/apps/client/src/app/pages/landing/landing-page.component.ts
+++ b/apps/client/src/app/pages/landing/landing-page.component.ts
@@ -46,7 +46,6 @@ export class GfLandingPageComponent implements OnDestroy, OnInit {
   } = {};
   public currentYear = format(new Date(), 'yyyy');
   public deviceType: string;
-  public hasPermissionForAuthToken: boolean;
   public hasPermissionForDemo: boolean;
   public hasPermissionForStatistics: boolean;
   public hasPermissionForSubscription: boolean;
@@ -127,11 +126,6 @@ export class GfLandingPageComponent implements OnDestroy, OnInit {
       };
     }
 
-    this.hasPermissionForAuthToken = hasPermission(
-      globalPermissions,
-      permissions.enableAuthToken
-    );
-
     this.hasPermissionForDemo = !!demoAuthToken;
 
     this.hasPermissionForStatistics = hasPermission(
diff --git a/apps/client/src/app/pages/pricing/pricing-page.component.ts b/apps/client/src/app/pages/pricing/pricing-page.component.ts
index 4d4e8e1b6..43822e137 100644
--- a/apps/client/src/app/pages/pricing/pricing-page.component.ts
+++ b/apps/client/src/app/pages/pricing/pricing-page.component.ts
@@ -52,7 +52,6 @@ export class GfPricingPageComponent implements OnDestroy, OnInit {
   public coupon: number;
   public couponId: string;
   public durationExtension: StringValue;
-  public hasPermissionForAuthToken: boolean;
   public hasPermissionToCreateUser: boolean;
   public hasPermissionToUpdateUserSettings: boolean;
   public importAndExportTooltipBasic = translate(
@@ -111,11 +110,6 @@ export class GfPricingPageComponent implements OnDestroy, OnInit {
     this.label = subscriptionOffer?.label;
     this.price = subscriptionOffer?.price;
 
-    this.hasPermissionForAuthToken = hasPermission(
-      globalPermissions,
-      permissions.enableAuthToken
-    );
-
     this.hasPermissionToCreateUser = hasPermission(
       globalPermissions,
       permissions.createUserAccount
diff --git a/apps/client/src/app/pages/pricing/pricing-page.html b/apps/client/src/app/pages/pricing/pricing-page.html
index 83a3bdd97..86b7b3d2b 100644
--- a/apps/client/src/app/pages/pricing/pricing-page.html
+++ b/apps/client/src/app/pages/pricing/pricing-page.html
@@ -367,7 +367,7 @@
         </p>
       </div>
     </div>
-  } @else if (!user && hasPermissionToCreateUser) {
+  } @else if (hasPermissionToCreateUser && !user) {
     <div class="row">
       <div class="col mt-3 text-center">
         <a