diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 0d886f771..3b51aa791 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -821,6 +821,16 @@ footer {
 
 .auth-page {
 
+  .cancel-button {
+    cursor: pointer;
+
+    &:hover,
+    &:active,
+    &:focus {
+      text-decoration: underline;
+    }
+  }
+
   .footer {
     margin-top: 0;
   }
diff --git a/app/views/users/registrations/finish_signup.html.erb b/app/views/users/registrations/finish_signup.html.erb
index 11bcca2f8..e9ae6f46f 100644
--- a/app/views/users/registrations/finish_signup.html.erb
+++ b/app/views/users/registrations/finish_signup.html.erb
@@ -20,7 +20,7 @@
   <% end %>
 
   <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %>
-  <div class="text-center">
-    <%= link_to t("devise_views.users.registrations.new.cancel"), destroy_user_session_path, class: "delete", method: :delete %>
-  </div>
 <% end %>
+<div class="text-center">
+  <%= button_to t("devise_views.users.registrations.new.cancel"), destroy_user_session_path, class: "delete cancel-button", method: :delete %>
+</div>
diff --git a/spec/system/users_auth_spec.rb b/spec/system/users_auth_spec.rb
index 970760354..31cb9bd53 100644
--- a/spec/system/users_auth_spec.rb
+++ b/spec/system/users_auth_spec.rb
@@ -211,7 +211,7 @@ describe "Users" do
         click_button "Sign up with Twitter"
 
         expect(page).to have_current_path(finish_signup_path)
-        click_link "Cancel login"
+        click_button "Cancel login"
 
         expect(page).to have_content "You have been signed out successfully"