diff --git a/authentik/stages/otp_static/templates/stages/otp_static/user_settings.html b/authentik/stages/otp_static/templates/stages/otp_static/user_settings.html
index f26509103..1c723707d 100644
--- a/authentik/stages/otp_static/templates/stages/otp_static/user_settings.html
+++ b/authentik/stages/otp_static/templates/stages/otp_static/user_settings.html
@@ -22,7 +22,7 @@
         </ul>
         {% if not state %}
             {% if stage.configure_flow %}
-                <a href="{% url 'authentik_flows:configure' stage_uuid=stage.stage_uuid %}?next={{ request.get_full_path }}" class="ak-root-link pf-c-button pf-m-primary">{% trans "Enable Static Tokens" %}</a>
+                <a href="{% url 'authentik_flows:configure' stage_uuid=stage.stage_uuid %}?next={% url 'authentik_core:user-settings' %}" class="ak-root-link pf-c-button pf-m-primary">{% trans "Enable Static Tokens" %}</a>
             {% endif %}
         {% else %}
         <a href="{% url 'authentik_stages_otp_static:disable' stage_uuid=stage.stage_uuid %}" class="ak-root-pf-c-button pf-m-danger">{% trans "Disable Static Tokens" %}</a>
diff --git a/authentik/stages/otp_static/views.py b/authentik/stages/otp_static/views.py
index 0f561d696..2dd113fdc 100644
--- a/authentik/stages/otp_static/views.py
+++ b/authentik/stages/otp_static/views.py
@@ -41,4 +41,4 @@ class DisableView(LoginRequiredMixin, View):
         Event.new(
             "static_otp_disable", message="User disabled Static OTP Tokens."
         ).from_http(request)
-        return redirect("authentik_stages_otp:otp-user-settings")
+        return redirect("authentik_core:user-settings")
diff --git a/authentik/stages/otp_time/templates/stages/otp_time/user_settings.html b/authentik/stages/otp_time/templates/stages/otp_time/user_settings.html
index 9d3fa624e..c6e24146e 100644
--- a/authentik/stages/otp_time/templates/stages/otp_time/user_settings.html
+++ b/authentik/stages/otp_time/templates/stages/otp_time/user_settings.html
@@ -18,7 +18,7 @@
         <p>
             {% if not state %}
                 {% if stage.configure_flow %}
-                    <a href="{% url 'authentik_flows:configure' stage_uuid=stage.stage_uuid %}?next={{ request.get_full_path }}" class="ak-root-link pf-c-button pf-m-primary">{% trans "Enable Time-based OTP" %}</a>
+                    <a href="{% url 'authentik_flows:configure' stage_uuid=stage.stage_uuid %}?next={% url 'authentik_core:user-settings' %}" class="ak-root-link pf-c-button pf-m-primary">{% trans "Enable Time-based OTP" %}</a>
                 {% endif %}
             {% else %}
             <a href="{% url 'authentik_stages_otp_time:disable' stage_uuid=stage.stage_uuid %}" class="ak-root-pf-c-button pf-m-danger">{% trans "Disable Time-based OTP" %}</a>
diff --git a/authentik/stages/otp_time/views.py b/authentik/stages/otp_time/views.py
index 813f76508..ad09a3c8b 100644
--- a/authentik/stages/otp_time/views.py
+++ b/authentik/stages/otp_time/views.py
@@ -38,4 +38,4 @@ class DisableView(LoginRequiredMixin, View):
         Event.new("totp_disable", message="User disabled Time-based OTP.").from_http(
             request
         )
-        return redirect("authentik_stages_otp:otp-user-settings")
+        return redirect("authentik_core:user-settings")