diff --git a/web/src/api/legacy.ts b/web/src/api/legacy.ts
index abce12739..3a6c8cb3b 100644
--- a/web/src/api/legacy.ts
+++ b/web/src/api/legacy.ts
@@ -32,18 +32,6 @@ export class AdminURLManager {
         return `/administration/sources/${rest}`;
     }
 
-    static tokens(rest: string): string {
-        return `/administration/tokens/${rest}`;
-    }
-
-}
-
-export class UserURLManager {
-
-    static tokens(rest: string): string {
-        return `/-/user/tokens/${rest}`;
-    }
-
 }
 
 export class AppURLManager {
diff --git a/web/src/elements/sidebar/Sidebar.ts b/web/src/elements/sidebar/Sidebar.ts
index 5a3624591..cec473142 100644
--- a/web/src/elements/sidebar/Sidebar.ts
+++ b/web/src/elements/sidebar/Sidebar.ts
@@ -100,6 +100,9 @@ export class Sidebar extends LitElement {
             PFNav,
             AKGlobal,
             css`
+                :host {
+                    z-index: 100;
+                }
                 .pf-c-nav__link.pf-m-current::after,
                 .pf-c-nav__link.pf-m-current:hover::after,
                 .pf-c-nav__item.pf-m-current:not(.pf-m-expanded) .pf-c-nav__link::after {
diff --git a/web/src/pages/stages/InvitationForm.ts b/web/src/pages/stages/InvitationForm.ts
index 5ed5bf81a..aaf24e9a4 100644
--- a/web/src/pages/stages/InvitationForm.ts
+++ b/web/src/pages/stages/InvitationForm.ts
@@ -4,7 +4,6 @@ import { customElement, property } from "lit-element";
 import { html, TemplateResult } from "lit-html";
 import { DEFAULT_CONFIG } from "../../api/Config";
 import { Form } from "../../elements/forms/Form";
-import { ifDefined } from "lit-html/directives/if-defined";
 import "../../elements/forms/HorizontalFormElement";
 import "../../elements/CodeMirror";
 import YAML from "yaml";
@@ -42,7 +41,7 @@ export class InvitationForm extends Form<Invitation> {
                 label=${gettext("Expires")}
                 ?required=${true}
                 name="expires">
-                <input type="date" value="${ifDefined(this.invitation?.expires)}" class="pf-c-form-control" required>
+                <input type="date" class="pf-c-form-control" required>
             </ak-form-element-horizontal>
             <ak-form-element-horizontal
                 label=${gettext("Attributes")}
diff --git a/web/src/pages/user-settings/tokens/UserTokenList.ts b/web/src/pages/user-settings/tokens/UserTokenList.ts
index 60cd1e25b..ed7772263 100644
--- a/web/src/pages/user-settings/tokens/UserTokenList.ts
+++ b/web/src/pages/user-settings/tokens/UserTokenList.ts
@@ -12,7 +12,6 @@ import { Table, TableColumn } from "../../../elements/table/Table";
 import { PAGE_SIZE } from "../../../constants";
 import { CoreApi, Token } from "authentik-api";
 import { DEFAULT_CONFIG } from "../../../api/Config";
-import { AdminURLManager } from "../../../api/legacy";
 import "./UserTokenForm";
 
 @customElement("ak-user-token-list")