diff --git a/src/app/pages/tokens/tokens.component.html b/src/app/pages/tokens/tokens.component.html
index 1ba88e8..f6565c0 100644
--- a/src/app/pages/tokens/tokens.component.html
+++ b/src/app/pages/tokens/tokens.component.html
@@ -21,13 +21,15 @@
             </a>
 
             <div class="flex column" *ngIf="!auth.authenticated">
-                <p>{{'tokens.register' | i18n}}</p>
+                <p *ngIf="canRegister()">{{'tokens.register' | i18n}}</p>
 
                 <a routerLink="/register" mat-raised-button color="accent" *ngIf="canRegister()">
                     <mat-icon>how_to_reg</mat-icon> {{'register' | i18n}}
                 </a>
 
-                <p>{{'tokens.login' | i18n}}</p>
+                <p *ngIf="canRegister()">{{'tokens.login' | i18n}}</p>
+
+                <p *ngIf="!canRegister()">{{'tokens.loginRequired' | i18n}}</p>
 
                 <a routerLink="/login" [queryParams]="{ target:'/tokens' }" mat-raised-button color="primary">
                     <mat-icon>login</mat-icon> {{'login' | i18n}}
@@ -44,7 +46,7 @@
 
     <div *ngIf="permissions && permissions[0]">
         <h3>{{'permissions' | i18n}}</h3>
-        <app-permissions [permissions]="permissions"></app-permissions>
+        <app-permissions [permissions]="permissions" [startsVisible]="canRegister()" [expiresVisible]="canRegister()"></app-permissions>
     </div>
     <div *ngIf="quotas && quotas[0]">
         <h3>{{'quotas' | i18n}}</h3>
diff --git a/src/app/ui/permissions/permissions.component.html b/src/app/ui/permissions/permissions.component.html
index c08d64a..74d5759 100644
--- a/src/app/ui/permissions/permissions.component.html
+++ b/src/app/ui/permissions/permissions.component.html
@@ -13,14 +13,15 @@
 
   <ng-container matColumnDef="starts">
     <th mat-header-cell *matHeaderCellDef mat-sort-header="starts"> {{'permissions.starts' | i18n}} </th>
-    <td mat-cell *matCellDef="let permission">{{permission.starts | datef:datetimeformat}}</td>
+    <td mat-cell *matCellDef="let permission">{{ startsVisible ? (permission.starts | datef:datetimeformat) : '-'}}</td>
   </ng-container>
 
   <ng-container matColumnDef="expires">
     <th mat-header-cell *matHeaderCellDef mat-sort-header="expires"> {{'permissions.expires' | i18n}} </th>
-    <td mat-cell *matCellDef="let permission">{{permission.expires | datef:datetimeformat}}</td>
+    <td mat-cell *matCellDef="let permission">{{ expiresVisible ? (permission.expires | datef:datetimeformat) : '-'}}
+    </td>
   </ng-container>
 
   <tr mat-header-row *matHeaderRowDef="permissionColumns"></tr>
   <tr mat-row *matRowDef="let myRowData; columns: permissionColumns"></tr>
-</table>
+</table>
\ No newline at end of file
diff --git a/src/app/ui/permissions/permissions.component.ts b/src/app/ui/permissions/permissions.component.ts
index cf825a2..cfcb08d 100644
--- a/src/app/ui/permissions/permissions.component.ts
+++ b/src/app/ui/permissions/permissions.component.ts
@@ -11,6 +11,8 @@ export class PermissionsComponent implements OnInit, OnChanges {
 
   datetimeformat: String;
   @Input() permissions;
+  @Input() startsVisible: boolean = true;
+  @Input() expiresVisible: boolean = true;
   permissionColumns = ["name", "starts", "expires"];
 
   constructor(private i18n: I18nService) {}