diff --git a/src/web/pages/templates/_components/device_card.html.j2 b/src/web/pages/templates/_components/device_card.html.j2
index cc6c4f372..7477bc00b 100644
--- a/src/web/pages/templates/_components/device_card.html.j2
+++ b/src/web/pages/templates/_components/device_card.html.j2
@@ -29,9 +29,7 @@
             Last active: {{ last_active }}
         </div>
         <div>
-        {% if style == DeviceCardStyle::Detailed %}
-            <a href="{{ crate::ROUTE_PREFIX }}/account/device/{{ device_id }}/remove">Remove</a>
-        {% else %}
+        {% if style != DeviceCardStyle::Detailed %}
             <a href="{{ crate::ROUTE_PREFIX }}/account/device/{{ device_id }}/">Details</a>
         {% endif %}
         </div>
diff --git a/src/web/pages/templates/device_info.html.j2 b/src/web/pages/templates/device_info.html.j2
index 476a7501b..9cedfc036 100644
--- a/src/web/pages/templates/device_info.html.j2
+++ b/src/web/pages/templates/device_info.html.j2
@@ -34,6 +34,7 @@ Device information
             {% endif %}
         </p>
     </section>
+    <a class="button" href="remove">Remove this device</a>
     {% if let Some((client_metadata, session_info)) = client_metadata %}
         <details>
             <summary>Client registration</summary>
diff --git a/src/web/pages/templates/remove_device.html.j2 b/src/web/pages/templates/remove_device.html.j2
index 64eb3909c..d82006d3f 100644
--- a/src/web/pages/templates/remove_device.html.j2
+++ b/src/web/pages/templates/remove_device.html.j2
@@ -6,7 +6,7 @@ Remove a device
 
 {%- block content -%}
 <div class="panel">
-    <h1>Remove a device <a class="back" href="{{ crate::ROUTE_PREFIX }}/account/">Back</a></h1>
+    <h1>Remove a device <a class="back" href=".">Back</a></h1>
     {% match body %}
         {% when RemoveDeviceBody::Form { device_card, last_device } %}
             {{ device_card }}
@@ -25,8 +25,9 @@ Remove a device
                 </p>
             {% endif %}
             <form method="post">
-                <button type="submit">Remove this device</button>
+                <button type="submit" class="slowdown">Remove this device</button>
             </form>
+            <script src="{{ crate::ROUTE_PREFIX }}/resources/slowdown.js" nonce="{{ context.csp_nonce }}"></script>
         {% when RemoveDeviceBody::Success %}
             <p>
                 The device has been signed out successfully.