diff --git a/Makefile b/Makefile
index 0f348b8cf..1a16f2a89 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,10 @@ lint:
 	bandit -r authentik tests lifecycle -x node_modules
 	pylint authentik tests lifecycle
 
-i18n-extract:
+i18n-extract: i18n-extract-core web-extract
+
+i18n-extract-core:
 	./manage.py makemessages --ignore web --ignore internal --ignore web --ignore web-api --ignore website -l en
-	cd web && npm run extract
 
 gen-build:
 	./manage.py spectacular --file schema.yml
@@ -82,7 +83,7 @@ migrate:
 run:
 	go run -v cmd/server/main.go
 
-web: web-lint-fix web-lint
+web: web-lint-fix web-lint web-extract
 
 web-lint-fix:
 	cd web && npm run prettier
@@ -90,3 +91,6 @@ web-lint-fix:
 web-lint:
 	cd web && npm run lint
 	cd web && npm run lit-analyse
+
+web-extract:
+	cd web && npm run extract
diff --git a/web/src/locales/en.po b/web/src/locales/en.po
index c116420f6..56b7ef55f 100644
--- a/web/src/locales/en.po
+++ b/web/src/locales/en.po
@@ -13,6 +13,10 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
+#: 
+#~ msgid "#/identity/users/{0}"
+#~ msgstr "#/identity/users/{0}"
+
 #: src/pages/providers/oauth2/OAuth2ProviderForm.ts
 #: src/pages/providers/oauth2/OAuth2ProviderForm.ts
 #: src/pages/providers/proxy/ProxyProviderForm.ts
@@ -1527,6 +1531,8 @@ msgstr "Each provider has a different issuer, based on the application slug."
 
 #: src/pages/applications/ApplicationViewPage.ts
 #: src/pages/applications/ApplicationViewPage.ts
+#: src/pages/flows/FlowViewPage.ts
+#: src/pages/flows/FlowViewPage.ts
 #: src/pages/providers/ldap/LDAPProviderViewPage.ts
 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts
 #: src/pages/providers/proxy/ProxyProviderViewPage.ts
@@ -5093,6 +5099,7 @@ msgstr "Up-to-date!"
 #: src/pages/flows/BoundStagesList.ts
 #: src/pages/flows/BoundStagesList.ts
 #: src/pages/flows/FlowListPage.ts
+#: src/pages/flows/FlowViewPage.ts
 #: src/pages/groups/GroupListPage.ts
 #: src/pages/outposts/OutpostListPage.ts
 #: src/pages/outposts/ServiceConnectionListPage.ts
@@ -5142,6 +5149,7 @@ msgid "Update Device"
 msgstr "Update Device"
 
 #: src/pages/flows/FlowListPage.ts
+#: src/pages/flows/FlowViewPage.ts
 msgid "Update Flow"
 msgstr "Update Flow"
 
diff --git a/web/src/locales/fr_FR.po b/web/src/locales/fr_FR.po
index 91466aef0..bb44d9c9c 100644
--- a/web/src/locales/fr_FR.po
+++ b/web/src/locales/fr_FR.po
@@ -19,6 +19,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: @lingui/cli\n"
 
+#: 
+#~ msgid "#/identity/users/{0}"
+#~ msgstr ""
+
 #: src/pages/providers/oauth2/OAuth2ProviderForm.ts
 #: src/pages/providers/oauth2/OAuth2ProviderForm.ts
 #: src/pages/providers/proxy/ProxyProviderForm.ts
@@ -1515,6 +1519,8 @@ msgstr "Chaque fournisseur a un émetteur différent, basé sur le slug de l'app
 
 #: src/pages/applications/ApplicationViewPage.ts
 #: src/pages/applications/ApplicationViewPage.ts
+#: src/pages/flows/FlowViewPage.ts
+#: src/pages/flows/FlowViewPage.ts
 #: src/pages/providers/ldap/LDAPProviderViewPage.ts
 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts
 #: src/pages/providers/proxy/ProxyProviderViewPage.ts
@@ -5034,6 +5040,7 @@ msgstr "À jour !"
 #: src/pages/flows/BoundStagesList.ts
 #: src/pages/flows/BoundStagesList.ts
 #: src/pages/flows/FlowListPage.ts
+#: src/pages/flows/FlowViewPage.ts
 #: src/pages/groups/GroupListPage.ts
 #: src/pages/outposts/OutpostListPage.ts
 #: src/pages/outposts/ServiceConnectionListPage.ts
@@ -5083,6 +5090,7 @@ msgid "Update Device"
 msgstr ""
 
 #: src/pages/flows/FlowListPage.ts
+#: src/pages/flows/FlowViewPage.ts
 msgid "Update Flow"
 msgstr "Mettre à jour le flux"
 
diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po
index b7d3d65d1..e43b5cf2e 100644
--- a/web/src/locales/pseudo-LOCALE.po
+++ b/web/src/locales/pseudo-LOCALE.po
@@ -13,6 +13,10 @@ msgstr ""
 "Language-Team: \n"
 "Plural-Forms: \n"
 
+#: 
+#~ msgid "#/identity/users/{0}"
+#~ msgstr ""
+
 #: src/pages/providers/oauth2/OAuth2ProviderForm.ts
 #: src/pages/providers/oauth2/OAuth2ProviderForm.ts
 #: src/pages/providers/proxy/ProxyProviderForm.ts
@@ -1519,6 +1523,8 @@ msgstr ""
 
 #: src/pages/applications/ApplicationViewPage.ts
 #: src/pages/applications/ApplicationViewPage.ts
+#: src/pages/flows/FlowViewPage.ts
+#: src/pages/flows/FlowViewPage.ts
 #: src/pages/providers/ldap/LDAPProviderViewPage.ts
 #: src/pages/providers/oauth2/OAuth2ProviderViewPage.ts
 #: src/pages/providers/proxy/ProxyProviderViewPage.ts
@@ -5078,6 +5084,7 @@ msgstr ""
 #: src/pages/flows/BoundStagesList.ts
 #: src/pages/flows/BoundStagesList.ts
 #: src/pages/flows/FlowListPage.ts
+#: src/pages/flows/FlowViewPage.ts
 #: src/pages/groups/GroupListPage.ts
 #: src/pages/outposts/OutpostListPage.ts
 #: src/pages/outposts/ServiceConnectionListPage.ts
@@ -5127,6 +5134,7 @@ msgid "Update Device"
 msgstr ""
 
 #: src/pages/flows/FlowListPage.ts
+#: src/pages/flows/FlowViewPage.ts
 msgid "Update Flow"
 msgstr ""
 
diff --git a/web/src/pages/flows/FlowViewPage.ts b/web/src/pages/flows/FlowViewPage.ts
index 0610df81a..75b372932 100644
--- a/web/src/pages/flows/FlowViewPage.ts
+++ b/web/src/pages/flows/FlowViewPage.ts
@@ -22,6 +22,7 @@ import "../../elements/events/ObjectChangelog";
 import "../policies/BoundPoliciesList";
 import "./BoundStagesList";
 import "./FlowDiagram";
+import "./FlowForm";
 
 @customElement("ak-flow-view")
 export class FlowViewPage extends LitElement {
@@ -85,6 +86,30 @@ export class FlowViewPage extends LitElement {
                             <div class="pf-c-card__body">
                                 <dl class="pf-c-description-list">
                                     <div class="pf-c-description-list__group">
+                                        <dt class="pf-c-description-list__term">
+                                            <span class="pf-c-description-list__text"
+                                                >${t`Edit`}</span
+                                            >
+                                        </dt>
+                                        <dd class="pf-c-description-list__description">
+                                            <div class="pf-c-description-list__text">
+                                                <ak-forms-modal>
+                                                    <span slot="submit"> ${t`Update`} </span>
+                                                    <span slot="header"> ${t`Update Flow`} </span>
+                                                    <ak-flow-form
+                                                        slot="form"
+                                                        .instancePk=${this.flow.slug}
+                                                    >
+                                                    </ak-flow-form>
+                                                    <button
+                                                        slot="trigger"
+                                                        class="pf-c-button pf-m-secondary"
+                                                    >
+                                                        ${t`Edit`}
+                                                    </button>
+                                                </ak-forms-modal>
+                                            </div>
+                                        </dd>
                                         <dt class="pf-c-description-list__term">
                                             <span class="pf-c-description-list__text"
                                                 >${t`Execute flow`}</span
diff --git a/web/src/pages/policies/BoundPoliciesList.ts b/web/src/pages/policies/BoundPoliciesList.ts
index 91baf8283..cc0f62f81 100644
--- a/web/src/pages/policies/BoundPoliciesList.ts
+++ b/web/src/pages/policies/BoundPoliciesList.ts
@@ -66,7 +66,7 @@ export class BoundPoliciesList extends Table<PolicyBinding> {
     getPolicyUserGroupRow(item: PolicyBinding): TemplateResult {
         const label = this.getPolicyUserGroupRowLabel(item);
         if (item.user) {
-            return html` <a href=${t`#/identity/users/${item.user}`}> ${label} </a> `;
+            return html` <a href=${`#/identity/users/${item.user}`}> ${label} </a> `;
         }
         return html`${label}`;
     }