diff --git a/hypha/templates/includes/org_login_button.html b/hypha/templates/includes/org_login_button.html
index f1e6ffb3117334999c9f7d999f1f43d187a86862..bf201e961b91ed5ab638c276f6c3c5e8cedecdd0 100644
--- a/hypha/templates/includes/org_login_button.html
+++ b/hypha/templates/includes/org_login_button.html
@@ -1,7 +1,7 @@
 {% load i18n heroicons %}
 <a
     class="button button--secondary button--login mb-4"
-    href="{% url "social:begin" "google-oauth2" %}{% if next %}?next={{ next }}{% endif %}"
+    href="{% url "social:begin" "google-oauth2" %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}"
 >
     {% heroicon_mini "building-office" size=18 class="inline align-text-bottom me-1" aria_hidden=true %}
     {% blocktrans %}Log in with your {{ ORG_SHORT_NAME }} email{% endblocktrans %}
diff --git a/hypha/templates/includes/password_login_button.html b/hypha/templates/includes/password_login_button.html
index 8c6199ca962fa8c1a8ca340b2fb780f42359c681..d7dc1a705a71d76340052b8bdf6599a9f2099504 100644
--- a/hypha/templates/includes/password_login_button.html
+++ b/hypha/templates/includes/password_login_button.html
@@ -1,7 +1,7 @@
 {% load i18n heroicons %}
 <a
     class="button button--secondary button--login"
-    href="{% url 'users:login' %}{% if next %}?next={{next}}{% endif %}"
+    href="{% url 'users:login' %}{% if redirect_url %}?next={{redirect_url}}{% endif %}"
 >
     {% heroicon_mini "key" size=18 class="inline align-text-bottom me-1" aria_hidden=true %}
     {% trans "Log in with password" %}
diff --git a/hypha/templates/includes/passwordless_login_button.html b/hypha/templates/includes/passwordless_login_button.html
index d3988e707d22ceb7546e7ddbf28b7f33c40b37fd..d5e761326cf47090ea21ac9bb72f88d50a4c06d6 100644
--- a/hypha/templates/includes/passwordless_login_button.html
+++ b/hypha/templates/includes/passwordless_login_button.html
@@ -1,7 +1,7 @@
 {% load i18n heroicons %}
 <a
     class="button button--secondary button--login"
-    href="{% url 'users:passwordless_login_signup' %}{% if next %}?next={{next}}{% endif %}"
+    href="{% url 'users:passwordless_login_signup' %}{% if redirect_url %}?next={{redirect_url}}{% endif %}"
 >
     {% heroicon_mini "envelope" size=18 class="inline align-text-bottom me-1" aria_hidden=true %}
     {% trans "Log in without password" %}