diff --git a/app/mailers/admin_confirmation_mailer.rb b/app/mailers/admin_confirmation_mailer.rb
index dc2d7df41de..4f7679d4bf3 100644
--- a/app/mailers/admin_confirmation_mailer.rb
+++ b/app/mailers/admin_confirmation_mailer.rb
@@ -8,7 +8,7 @@ class AdminConfirmationMailer < ActionMailer::Base
       to_address,
       template: 'admin_confirmation_mailer',
       target_username: target_username,
-      admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url_no_prefix)
+      admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url)
     )
   end
 end
diff --git a/app/views/users/confirm_admin.html.erb b/app/views/users/confirm_admin.html.erb
index 4e996da74a7..2f9d3cdd4a7 100644
--- a/app/views/users/confirm_admin.html.erb
+++ b/app/views/users/confirm_admin.html.erb
@@ -14,7 +14,7 @@
     <%=raw (t('activation.admin_confirm.complete', target_username: @confirmation.target_user.username)) %>
     <br/>
     <br/>
-    <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), "/", class: 'btn btn-primary' %>
+    <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), Discourse.base_url, class: 'btn btn-primary' %>
   <% end %>
 
 </div>