diff --git a/web/scripts/eslint-nightmare.mjs b/web/scripts/eslint-nightmare.mjs
deleted file mode 100644
index 0d463c2119..0000000000
--- a/web/scripts/eslint-nightmare.mjs
+++ /dev/null
@@ -1,55 +0,0 @@
-import { execFileSync } from "child_process";
-import { ESLint } from "eslint";
-import path from "path";
-import process from "process";
-
-// Code assumes this script is in the './web/scripts' folder.
-const projectRoot = execFileSync("git", ["rev-parse", "--show-toplevel"], {
-    encoding: "utf8",
-}).replace("\n", "");
-process.chdir(path.join(projectRoot, "./web"));
-
-const eslintConfig = {
-    overrideConfig: {
-        env: {
-            browser: true,
-            es2021: true,
-        },
-        extends: [
-            "eslint:recommended",
-            "plugin:@typescript-eslint/recommended",
-            "plugin:lit/recommended",
-            "plugin:custom-elements/recommended",
-            "plugin:storybook/recommended",
-            "plugin:sonarjs/recommended",
-        ],
-        parser: "@typescript-eslint/parser",
-        parserOptions: {
-            ecmaVersion: 12,
-            sourceType: "module",
-        },
-        plugins: ["@typescript-eslint", "lit", "custom-elements", "sonarjs"],
-        rules: {
-            "indent": "off",
-            "linebreak-style": ["error", "unix"],
-            "quotes": ["error", "double", { avoidEscape: true }],
-            "semi": ["error", "always"],
-            "@typescript-eslint/ban-ts-comment": "off",
-            "sonarjs/cognitive-complexity": ["error", 9],
-            "sonarjs/no-duplicate-string": "off",
-            "sonarjs/no-nested-template-literals": "off",
-        },
-    },
-};
-
-const updated = ["./src/", "./build.mjs", "./scripts/*.mjs"];
-
-const eslint = new ESLint(eslintConfig);
-const results = await eslint.lintFiles(updated);
-const formatter = await eslint.loadFormatter("stylish");
-const resultText = formatter.format(results);
-const errors = results.reduce((acc, result) => acc + result.errorCount, 0);
-
-// eslint-disable-next-line no-console
-console.log(resultText);
-process.exit(errors > 1 ? 1 : 0);
diff --git a/web/scripts/eslint-precommit.mjs b/web/scripts/eslint-precommit.mjs
index 2f826968c9..4bf4293441 100644
--- a/web/scripts/eslint-precommit.mjs
+++ b/web/scripts/eslint-precommit.mjs
@@ -43,34 +43,53 @@ const eslintConfig = {
     },
 };
 
-const porcelainV1 = /^(..)\s+(.*$)/;
-const gitStatus = execFileSync("git", ["status", "--porcelain", "."], { encoding: "utf8" });
+function findChangedFiles() {
+    const porcelainV1 = /^(..)\s+(.*$)/;
+    const gitStatus = execFileSync("git", ["status", "--porcelain", "."], { encoding: "utf8" });
 
-const statuses = gitStatus.split("\n").reduce((acc, line) => {
-    const match = porcelainV1.exec(line.replace("\n"));
-    if (!match) {
-        return acc;
-    }
-    const [status, path] = Array.from(match).slice(1, 3);
-    return [...acc, [status, path.split("\x00")[0]]];
-}, []);
+    const statuses = gitStatus.split("\n").reduce((acc, line) => {
+        const match = porcelainV1.exec(line.replace("\n"));
+        if (!match) {
+            return acc;
+        }
+        const [status, path] = Array.from(match).slice(1, 3);
+        return [...acc, [status, path.split("\x00")[0]]];
+    }, []);
 
-const isModified = /^(M|\?|\s)(M|\?|\s)/;
-const modified = (s) => isModified.test(s);
+    const isModified = /^(M|\?|\s)(M|\?|\s)/;
+    const modified = (s) => isModified.test(s);
 
-const isCheckable = /\.(ts|js|mjs)$/;
-const checkable = (s) => isCheckable.test(s);
+    const isCheckable = /\.(ts|js|mjs)$/;
+    const checkable = (s) => isCheckable.test(s);
 
-const ignored = /\/\.storybook\//;
-const notIgnored = (s) => !ignored.test(s);
+    const ignored = /\/\.storybook\//;
+    const notIgnored = (s) => !ignored.test(s);
 
-const updated = statuses.reduce(
-    (acc, [status, filename]) =>
-        modified(status) && checkable(filename) && notIgnored(filename)
-            ? [...acc, path.join(projectRoot, filename)]
-            : acc,
-    [],
-);
+    return statuses.reduce(
+        (acc, [status, filename]) =>
+            modified(status) && checkable(filename) && notIgnored(filename)
+                ? [...acc, path.join(projectRoot, filename)]
+                : acc,
+        []
+    );
+}
+
+if (process.argv.length > 2 && (process.argv[2] === "-h" || process.argv[2] === "--help")) {
+    // eslint-disable-next-line no-console
+    console.log(`Run eslint with extra-hard checks
+
+options:
+  -c, --changed: (default) check only the files that have changed
+  -n, --nightmare: check all the files in the repository
+  -h, --help: This help message
+`);
+    process.exit(0);
+}
+
+const updated =
+    process.argv.length > 2 && (process.argv[2] === "-n" || process.argv[2] === "--nightmare")
+        ? ["./src/", "./build.mjs", "./scripts/*.mjs"]
+        : findChangedFiles();
 
 const eslint = new ESLint(eslintConfig);
 const results = await eslint.lintFiles(updated);
diff --git a/web/src/flow/stages/RedirectStage.ts b/web/src/flow/stages/RedirectStage.ts
index e43b883950..c38ddb38e8 100644
--- a/web/src/flow/stages/RedirectStage.ts
+++ b/web/src/flow/stages/RedirectStage.ts
@@ -45,10 +45,7 @@ export class RedirectStage extends BaseStage<RedirectChallenge, FlowChallengeRes
         if (this.promptUser) {
             return;
         }
-        console.debug(
-            "authentik/stages/redirect: redirecting to url from server",
-            this.challenge.to,
-        );
+        console.debug("authentik/stages/redirect: redirecting to url from server", this.challenge.to);
         window.location.assign(this.challenge.to);
         this.startedRedirect = true;
     }
@@ -60,10 +57,7 @@ export class RedirectStage extends BaseStage<RedirectChallenge, FlowChallengeRes
         // As this wouldn't really be a redirect, show a message that the page can be closed
         // and try to close it ourselves
         if (!url.protocol.startsWith("http")) {
-            return html`<ak-empty-state
-                icon="fas fa-check"
-                header=${msg("You may close this page now.")}
-            >
+            return html`<ak-empty-state icon="fas fa-check" header=${msg("You may close this page now.")}>
             </ak-empty-state>`;
         }
         return html`<ak-empty-state ?loading=${true} header=${msg("Loading")}> </ak-empty-state>`;
@@ -79,7 +73,7 @@ export class RedirectStage extends BaseStage<RedirectChallenge, FlowChallengeRes
             <div class="pf-c-login__main-body">
                 <form class="pf-c-form">
                     <div class="pf-c-form__group">
-                        <p>${msg("You're about to be redirect to the following URL.")}</p>
+                        <p>${msg("You're about to be redirected to the following URL.")}</p>
                         <code>${this.getURL()}</code>
                     </div>
                     <div class="pf-c-form__group pf-m-action">