diff --git a/authentik/stages/authenticator_validate/forms.py b/authentik/stages/authenticator_validate/forms.py
index 23e87fba0..bdc4c9316 100644
--- a/authentik/stages/authenticator_validate/forms.py
+++ b/authentik/stages/authenticator_validate/forms.py
@@ -19,7 +19,7 @@ class ValidationForm(forms.Form):
         label=_("Please enter the token from your device."),
         widget=forms.TextInput(
             attrs={
-                "autocomplete": "off",
+                "autocomplete": "one-time-code",
                 "placeholder": "123456",
                 "autofocus": "autofocus",
             }
diff --git a/web/src/elements/notifications/NotificationTrigger.ts b/web/src/elements/notifications/NotificationTrigger.ts
index db7f581e0..842a18c2e 100644
--- a/web/src/elements/notifications/NotificationTrigger.ts
+++ b/web/src/elements/notifications/NotificationTrigger.ts
@@ -1,8 +1,13 @@
-import { customElement, html, LitElement, TemplateResult } from "lit-element";
+import { CSSResult, customElement, html, LitElement, TemplateResult } from "lit-element";
+import { COMMON_STYLES } from "../../common/styles";
 
 @customElement("ak-notification-trigger")
 export class NotificationRule extends LitElement {
 
+    static get styles(): CSSResult[] {
+        return COMMON_STYLES;
+    }
+
     constructor() {
         super();
         this.addEventListener("click", () => {
@@ -16,7 +21,8 @@ export class NotificationRule extends LitElement {
     }
 
     render(): TemplateResult {
-        return html`<slot></slot>`;
+        // TODO: Show icon with red dot when unread notifications exist
+        return html`<i class="fas fa-bell pf-c-dropdown__toggle-icon" aria-hidden="true"></i>`;
     }
 
 }
diff --git a/web/src/elements/sidebar/SidebarUser.ts b/web/src/elements/sidebar/SidebarUser.ts
index 73c79f188..01a75d470 100644
--- a/web/src/elements/sidebar/SidebarUser.ts
+++ b/web/src/elements/sidebar/SidebarUser.ts
@@ -37,11 +37,11 @@ export class SidebarUser extends LitElement {
     render(): TemplateResult {
         return html`
             <a href="#/-/user/" class="pf-c-nav__link user-avatar" id="user-settings">
-                ${until(User.me().then(u => {
-        return html`<img class="pf-c-avatar" src="${u.avatar}" alt="" />`;}), html``)}
+                ${until(User.me().then((u) => {
+                    return html`<img class="pf-c-avatar" src="${u.avatar}" alt="" />`;
+                }), html``)}
             </a>
             <ak-notification-trigger class="pf-c-nav__link user-notifications">
-                <i class="fas fa-bell pf-c-dropdown__toggle-icon" aria-hidden="true"></i>
             </ak-notification-trigger>
             <a href="/flows/-/default/invalidation/" class="pf-c-nav__link user-logout" id="logout">
                 <i class="fas fa-sign-out-alt" aria-hidden="true"></i>