3 files changed, 6 insertions, 11 deletions
diff --git a/lib/pleroma/web/auth/authenticator.ex b/lib/pleroma/web/auth/authenticator.ex
index 4eeef5034..89d88af32 100644
--- a/lib/pleroma/web/auth/authenticator.ex
+++ b/lib/pleroma/web/auth/authenticator.ex
@@ -31,12 +31,15 @@ defmodule Pleroma.Web.Auth.Authenticator do
 
   @callback auth_template() :: String.t() | nil
   def auth_template do
-    implementation().auth_template() || Pleroma.Config.get(:auth_template, "show.html")
+    # Note: `config :pleroma, :auth_template, "..."` support is deprecated
+    implementation().auth_template() ||
+      Pleroma.Config.get([:auth, :auth_template], Pleroma.Config.get(:auth_template)) ||
+      "show.html"
   end
 
   @callback oauth_consumer_template() :: String.t() | nil
   def oauth_consumer_template do
     implementation().oauth_consumer_template() ||
-      Pleroma.Config.get(:oauth_consumer_template, "consumer.html")
+      Pleroma.Config.get([:auth, :oauth_consumer_template], "consumer.html")
   end
 end
diff --git a/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex b/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex
index 9365c7c44..85f62ca64 100644
--- a/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex
+++ b/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex
@@ -1,5 +1,3 @@
-<br>
-<br>
 <h2>Sign in with external provider</h2>
 
 <%= form_for @conn, o_auth_path(@conn, :prepare_request), [method: "get"], fn f -> %>
diff --git a/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex b/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex
index 2e806e5fb..126390391 100644
--- a/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex
+++ b/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex
@@ -7,10 +7,7 @@
 
 <h2>Registration Details</h2>
 
-<p>If you'd like to register a new account,
-<br>
-please provide the details below.</p>
-<br>
+<p>If you'd like to register a new account, please provide the details below.</p>
 
 <%= form_for @conn, o_auth_path(@conn, :register), [], fn f -> %>
 
@@ -25,9 +22,6 @@ please provide the details below.</p>
 
 <%= submit "Proceed as new user", name: "op", value: "register" %>
 
-<br>
-<br>
-<br>
 <p>Alternatively, sign in to connect to existing account.</p>
 
 <div class="input">