diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index c3f11cbea..fbde65ca7 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2021.2.3-stable
+current_version = 2021.2.4-stable
 tag = True
 commit = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\-(?P<release>.*)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 93dec13b0..5cbcca3a4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,11 +18,11 @@ jobs:
       - name: Building Docker Image
         run: docker build
           --no-cache
-          -t beryju/authentik:2021.2.3-stable
+          -t beryju/authentik:2021.2.4-stable
           -t beryju/authentik:latest
           -f Dockerfile .
       - name: Push Docker Container to Registry (versioned)
-        run: docker push beryju/authentik:2021.2.3-stable
+        run: docker push beryju/authentik:2021.2.4-stable
       - name: Push Docker Container to Registry (latest)
         run: docker push beryju/authentik:latest
   build-proxy:
@@ -48,11 +48,11 @@ jobs:
           cd outpost/
           docker build \
           --no-cache \
-          -t beryju/authentik-proxy:2021.2.3-stable \
+          -t beryju/authentik-proxy:2021.2.4-stable \
           -t beryju/authentik-proxy:latest \
           -f proxy.Dockerfile .
       - name: Push Docker Container to Registry (versioned)
-        run: docker push beryju/authentik-proxy:2021.2.3-stable
+        run: docker push beryju/authentik-proxy:2021.2.4-stable
       - name: Push Docker Container to Registry (latest)
         run: docker push beryju/authentik-proxy:latest
   build-static:
@@ -69,11 +69,11 @@ jobs:
           cd web/
           docker build \
           --no-cache \
-          -t beryju/authentik-static:2021.2.3-stable \
+          -t beryju/authentik-static:2021.2.4-stable \
           -t beryju/authentik-static:latest \
           -f Dockerfile .
       - name: Push Docker Container to Registry (versioned)
-        run: docker push beryju/authentik-static:2021.2.3-stable
+        run: docker push beryju/authentik-static:2021.2.4-stable
       - name: Push Docker Container to Registry (latest)
         run: docker push beryju/authentik-static:latest
   test-release:
@@ -107,5 +107,5 @@ jobs:
           SENTRY_PROJECT: authentik
           SENTRY_URL: https://sentry.beryju.org
         with:
-          tagName: 2021.2.3-stable
+          tagName: 2021.2.4-stable
           environment: beryjuorg-prod
diff --git a/authentik/__init__.py b/authentik/__init__.py
index 4d8564b55..f01befede 100644
--- a/authentik/__init__.py
+++ b/authentik/__init__.py
@@ -1,2 +1,2 @@
 """authentik"""
-__version__ = "2021.2.3-stable"
+__version__ = "2021.2.4-stable"
diff --git a/authentik/admin/views/applications.py b/authentik/admin/views/applications.py
index f80eda369..37eab8216 100644
--- a/authentik/admin/views/applications.py
+++ b/authentik/admin/views/applications.py
@@ -29,6 +29,7 @@ class ApplicationCreateView(
     form_class = ApplicationForm
     permission_required = "authentik_core.add_application"
 
+    success_url = "/"
     template_name = "generic/create.html"
     success_message = _("Successfully created Application")
 
@@ -61,6 +62,7 @@ class ApplicationUpdateView(
     form_class = ApplicationForm
     permission_required = "authentik_core.change_application"
 
+    success_url = "/"
     template_name = "generic/update.html"
     success_message = _("Successfully updated Application")
 
@@ -73,5 +75,6 @@ class ApplicationDeleteView(
     model = Application
     permission_required = "authentik_core.delete_application"
 
+    success_url = "/"
     template_name = "generic/delete.html"
     success_message = _("Successfully deleted Application")
diff --git a/authentik/admin/views/events_notifications_rules.py b/authentik/admin/views/events_notifications_rules.py
index 66577dc40..b1caa9df8 100644
--- a/authentik/admin/views/events_notifications_rules.py
+++ b/authentik/admin/views/events_notifications_rules.py
@@ -26,6 +26,7 @@ class NotificationRuleCreateView(
     form_class = NotificationRuleForm
     permission_required = "authentik_events.add_NotificationRule"
 
+    success_url = "/"
     template_name = "generic/create.html"
     success_message = _("Successfully created Notification Rule")
 
@@ -42,6 +43,7 @@ class NotificationRuleUpdateView(
     form_class = NotificationRuleForm
     permission_required = "authentik_events.change_NotificationRule"
 
+    success_url = "/"
     template_name = "generic/update.html"
     success_message = _("Successfully updated Notification Rule")
 
@@ -54,5 +56,6 @@ class NotificationRuleDeleteView(
     model = NotificationRule
     permission_required = "authentik_events.delete_NotificationRule"
 
+    success_url = "/"
     template_name = "generic/delete.html"
     success_message = _("Successfully deleted Notification Rule")
diff --git a/authentik/admin/views/events_notifications_transports.py b/authentik/admin/views/events_notifications_transports.py
index a5c4cd990..f13c3340c 100644
--- a/authentik/admin/views/events_notifications_transports.py
+++ b/authentik/admin/views/events_notifications_transports.py
@@ -25,7 +25,7 @@ class NotificationTransportCreateView(
     model = NotificationTransport
     form_class = NotificationTransportForm
     permission_required = "authentik_events.add_notificationtransport"
-
+    success_url = "/"
     template_name = "generic/create.html"
     success_message = _("Successfully created Notification Transport")
 
@@ -41,7 +41,7 @@ class NotificationTransportUpdateView(
     model = NotificationTransport
     form_class = NotificationTransportForm
     permission_required = "authentik_events.change_notificationtransport"
-
+    success_url = "/"
     template_name = "generic/update.html"
     success_message = _("Successfully updated Notification Transport")
 
@@ -53,6 +53,6 @@ class NotificationTransportDeleteView(
 
     model = NotificationTransport
     permission_required = "authentik_events.delete_notificationtransport"
-
+    success_url = "/"
     template_name = "generic/delete.html"
     success_message = _("Successfully deleted Notification Transport")
diff --git a/authentik/admin/views/outposts.py b/authentik/admin/views/outposts.py
index fc160b901..17aced477 100644
--- a/authentik/admin/views/outposts.py
+++ b/authentik/admin/views/outposts.py
@@ -28,7 +28,7 @@ class OutpostCreateView(
     model = Outpost
     form_class = OutpostForm
     permission_required = "authentik_outposts.add_outpost"
-
+    success_url = "/"
     template_name = "generic/create.html"
     success_message = _("Successfully created Outpost")
 
@@ -51,7 +51,7 @@ class OutpostUpdateView(
     model = Outpost
     form_class = OutpostForm
     permission_required = "authentik_outposts.change_outpost"
-
+    success_url = "/"
     template_name = "generic/update.html"
     success_message = _("Successfully updated Outpost")
 
@@ -61,6 +61,6 @@ class OutpostDeleteView(LoginRequiredMixin, PermissionRequiredMixin, DeleteMessa
 
     model = Outpost
     permission_required = "authentik_outposts.delete_outpost"
-
+    success_url = "/"
     template_name = "generic/delete.html"
     success_message = _("Successfully deleted Outpost")
diff --git a/authentik/admin/views/property_mappings.py b/authentik/admin/views/property_mappings.py
index f9b2fc7d7..578b63f91 100644
--- a/authentik/admin/views/property_mappings.py
+++ b/authentik/admin/views/property_mappings.py
@@ -32,7 +32,7 @@ class PropertyMappingCreateView(
 
     model = PropertyMapping
     permission_required = "authentik_core.add_propertymapping"
-
+    success_url = "/"
     template_name = "generic/create.html"
     success_message = _("Successfully created Property Mapping")
 
@@ -47,7 +47,7 @@ class PropertyMappingUpdateView(
 
     model = PropertyMapping
     permission_required = "authentik_core.change_propertymapping"
-
+    success_url = "/"
     template_name = "generic/update.html"
     success_message = _("Successfully updated Property Mapping")
 
@@ -59,7 +59,7 @@ class PropertyMappingDeleteView(
 
     model = PropertyMapping
     permission_required = "authentik_core.delete_propertymapping"
-
+    success_url = "/"
     template_name = "generic/delete.html"
     success_message = _("Successfully deleted Property Mapping")
 
diff --git a/authentik/admin/views/providers.py b/authentik/admin/views/providers.py
index 71394c18a..3dcc59d59 100644
--- a/authentik/admin/views/providers.py
+++ b/authentik/admin/views/providers.py
@@ -25,7 +25,7 @@ class ProviderCreateView(
 
     model = Provider
     permission_required = "authentik_core.add_provider"
-
+    success_url = "/"
     template_name = "generic/create.html"
     success_message = _("Successfully created Provider")
 
@@ -40,7 +40,7 @@ class ProviderUpdateView(
 
     model = Provider
     permission_required = "authentik_core.change_provider"
-
+    success_url = "/"
     template_name = "generic/update.html"
     success_message = _("Successfully updated Provider")
 
@@ -52,6 +52,6 @@ class ProviderDeleteView(
 
     model = Provider
     permission_required = "authentik_core.delete_provider"
-
+    success_url = "/"
     template_name = "generic/delete.html"
     success_message = _("Successfully deleted Provider")
diff --git a/authentik/admin/views/sources.py b/authentik/admin/views/sources.py
index 5bc002ced..c9c4fef2b 100644
--- a/authentik/admin/views/sources.py
+++ b/authentik/admin/views/sources.py
@@ -26,6 +26,7 @@ class SourceCreateView(
     model = Source
     permission_required = "authentik_core.add_source"
 
+    success_url = "/"
     template_name = "generic/create.html"
     success_message = _("Successfully created Source")
 
@@ -41,6 +42,7 @@ class SourceUpdateView(
     model = Source
     permission_required = "authentik_core.change_source"
 
+    success_url = "/"
     template_name = "generic/update.html"
     success_message = _("Successfully updated Source")
 
@@ -51,5 +53,6 @@ class SourceDeleteView(LoginRequiredMixin, PermissionRequiredMixin, DeleteMessag
     model = Source
     permission_required = "authentik_core.delete_source"
 
+    success_url = "/"
     template_name = "generic/delete.html"
     success_message = _("Successfully deleted Source")
diff --git a/authentik/core/templates/user/settings.html b/authentik/core/templates/user/settings.html
index 6305bc773..50f70d560 100644
--- a/authentik/core/templates/user/settings.html
+++ b/authentik/core/templates/user/settings.html
@@ -39,8 +39,8 @@
             </section>
             {% endfor %}
             {% user_sources as user_sources_loc %}
-            {% for source, source_link in user_sources_loc.item %}
-            <section slot="page-{{ source.pk }}" data-tab-title="{{ source|verbose_name }}" class="pf-c-page__main-section pf-m-no-padding-mobile">
+            {% for source, source_link in user_sources_loc.items %}
+            <section slot="page-{{ source.pk }}" data-tab-title="{{ source.name }}" class="pf-c-page__main-section pf-m-no-padding-mobile">
                 <div class="pf-u-display-flex pf-u-justify-content-center">
                     <div class="pf-u-w-75">
                         <ak-site-shell url="{{ source_link }}">
diff --git a/docker-compose.yml b/docker-compose.yml
index 2dae1c702..eaf5d808f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     networks:
       - internal
   server:
-    image: beryju/authentik:${AUTHENTIK_TAG:-2021.2.3-stable}
+    image: beryju/authentik:${AUTHENTIK_TAG:-2021.2.4-stable}
     command: server
     environment:
       AUTHENTIK_REDIS__HOST: redis
@@ -45,7 +45,7 @@ services:
     env_file:
       - .env
   worker:
-    image: beryju/authentik:${AUTHENTIK_TAG:-2021.2.3-stable}
+    image: beryju/authentik:${AUTHENTIK_TAG:-2021.2.4-stable}
     command: worker
     networks:
       - internal
@@ -62,7 +62,7 @@ services:
     env_file:
       - .env
   static:
-    image: beryju/authentik-static:${AUTHENTIK_TAG:-2021.2.3-stable}
+    image: beryju/authentik-static:${AUTHENTIK_TAG:-2021.2.4-stable}
     networks:
       - internal
     labels:
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 4bd11e55d..d1d5e44c1 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -4,7 +4,7 @@ name: authentik
 home: https://goauthentik.io
 sources:
   - https://github.com/BeryJu/authentik
-version: "2021.2.3-stable"
+version: "2021.2.4-stable"
 icon: https://raw.githubusercontent.com/BeryJu/authentik/master/web/icons/icon.svg
 dependencies:
   - name: postgresql
diff --git a/helm/README.md b/helm/README.md
index 5ee5f2800..91190b451 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -4,7 +4,7 @@
 |-----------------------------------|-------------------------|-------------|
 | image.name                        | beryju/authentik        | Image used to run the authentik server and worker |
 | image.name_static                 | beryju/authentik-static | Image used to run the authentik static server (CSS and JS Files) |
-| image.tag                         | 2021.2.3-stable           | Image tag |
+| image.tag                         | 2021.2.4-stable           | Image tag |
 | image.pullPolicy                  | IfNotPresent            | Image Pull Policy used for all deployments |
 | serverReplicas                    | 1                       | Replicas for the Server deployment |
 | workerReplicas                    | 1                       | Replicas for the Worker deployment |
diff --git a/helm/values.yaml b/helm/values.yaml
index 36752949b..fdec33928 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -5,7 +5,7 @@ image:
   name: beryju/authentik
   name_static: beryju/authentik-static
   name_outposts: beryju/authentik # Prefix used for Outpost deployments, Outpost type and version is appended
-  tag: 2021.2.3-stable
+  tag: 2021.2.4-stable
   pullPolicy: IfNotPresent
 
 serverReplicas: 1
diff --git a/outpost/pkg/version.go b/outpost/pkg/version.go
index 804bf862e..d80ad67be 100644
--- a/outpost/pkg/version.go
+++ b/outpost/pkg/version.go
@@ -1,3 +1,3 @@
 package pkg
 
-const VERSION = "2021.2.3-stable"
+const VERSION = "2021.2.4-stable"
diff --git a/web/src/constants.ts b/web/src/constants.ts
index fc0e418a1..479352474 100644
--- a/web/src/constants.ts
+++ b/web/src/constants.ts
@@ -28,4 +28,4 @@ export const ColorStyles = css`
         background-color: var(--pf-global--danger-color--100);
     }
 `;
-export const VERSION = "2021.2.3-stable";
+export const VERSION = "2021.2.4-stable";
diff --git a/website/docs/installation/docker-compose.md b/website/docs/installation/docker-compose.md
index be3dc42d4..77647cb92 100644
--- a/website/docs/installation/docker-compose.md
+++ b/website/docs/installation/docker-compose.md
@@ -16,7 +16,7 @@ Download the latest `docker-compose.yml` from [here](https://raw.githubuserconte
 
 To optionally enable error-reporting, run `echo AUTHENTIK_ERROR_REPORTING__ENABLED=true >> .env`
 
-To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.2.3-stable >> .env`
+To optionally deploy a different version run `echo AUTHENTIK_TAG=2021.2.4-stable >> .env`
 
 If this is a fresh authentik install run the following commands to generate a password:
 
diff --git a/website/docs/installation/kubernetes.md b/website/docs/installation/kubernetes.md
index 1ac89731c..ba606711f 100644
--- a/website/docs/installation/kubernetes.md
+++ b/website/docs/installation/kubernetes.md
@@ -24,7 +24,7 @@ image:
     name: beryju/authentik
     name_static: beryju/authentik-static
     name_outposts: beryju/authentik # Prefix used for Outpost deployments, Outpost type and version is appended
-    tag: 2021.2.3-stable
+    tag: 2021.2.4-stable
 
 serverReplicas: 1
 workerReplicas: 1
diff --git a/website/docs/releases/2021.2.md b/website/docs/releases/2021.2.md
index 8d76aa6c7..bc2aa1445 100644
--- a/website/docs/releases/2021.2.md
+++ b/website/docs/releases/2021.2.md
@@ -77,6 +77,11 @@ title: Release 2021.1.2
 - core: fix tokens using wrong lookup
 - web: fix missing source create button
 
+## Fixed in 2021.2.4-stable
+
+- admin: fix missing success_urls causing errors on create/update forms
+- core: fix typo in user settings causing sources to not show
+
 ## Upgrading
 
 This release does not introduce any new requirements.