diff --git a/passbook/stages/otp_time/stage.py b/passbook/stages/otp_time/stage.py
index bd557cc66..182ea22c6 100644
--- a/passbook/stages/otp_time/stage.py
+++ b/passbook/stages/otp_time/stage.py
@@ -36,7 +36,9 @@ class OTPTimeStageView(FormView, StageView):
         qr_code = QRCode(image_factory=SvgFillImage)
         qr_code.add_data(device.config_url)
         svg_image = tostring(qr_code.make_image().get_image())
-        sr_wrapper = f'<div aria-label="{device.config_url}">{force_str(svg_image)}</div>'
+        sr_wrapper = (
+            f'<div aria-label="{device.config_url}">{force_str(svg_image)}</div>'
+        )
         return sr_wrapper
 
     def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
diff --git a/passbook/stages/otp_time/templates/stages/otp_time/user_settings.html b/passbook/stages/otp_time/templates/stages/otp_time/user_settings.html
index d3d0fd9db..b62df7707 100644
--- a/passbook/stages/otp_time/templates/stages/otp_time/user_settings.html
+++ b/passbook/stages/otp_time/templates/stages/otp_time/user_settings.html
@@ -22,7 +22,7 @@
         <p>
             {% if not state %}
                 {% if stage.configure_flow %}
-                    <a href="{% url 'passbook_flows:configure' stage_uuid=stage.stage_uuid %}" class="pf-c-button pf-m-primary">{% trans "Enable Time-based OTP" %}</a>
+                    <a href="{% url 'passbook_flows:configure' stage_uuid=stage.stage_uuid %}?next={{ request.get_full_path }}" class="pf-c-button pf-m-primary">{% trans "Enable Time-based OTP" %}</a>
                 {% endif %}
             {% else %}
             <a href="{% url 'passbook_stages_otp_time:disable' stage_uuid=stage.stage_uuid %}" class="pf-c-button pf-m-danger">{% trans "Disable Time-based OTP" %}</a>