diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 807baba14..80cff6982 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -260,6 +260,10 @@ module ApplicationHelper
     'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
   end
 
+  def within_authorization_flow?
+    session[:user_return_to].present? && Rails.application.routes.recognize_path(session[:user_return_to])[:controller] == 'oauth/authorizations'
+  end
+
   private
 
   def storage_host_var
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index 89903581a..67b958d38 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -41,4 +41,5 @@
       - resource_class.omniauth_providers.each do |provider|
         = provider_sign_in_link(provider)
 
-.form-footer= render 'auth/shared/links'
+- unless within_authorization_flow?
+  .form-footer= render 'auth/shared/links'
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index c351e3563..bdbcc84e1 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -5,8 +5,11 @@
   .container-alt
     .logo-container
       %h1
-        = link_to root_path do
+        - if within_authorization_flow?
           = logo_as_symbol(:wordmark)
+        - else
+          = link_to root_path do
+            = logo_as_symbol(:wordmark)
 
     .form-container
       = render 'flashes'