diff --git a/frappe/www/login.html b/frappe/www/login.html
index 85e5ae9296..b938885a1a 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -81,7 +81,7 @@
 				<div class="page-card-body">
 					<form class="form-signin form-login" role="form">
 						{{ email_login_body() }}
-					</form>	
+					</form>
 					<div class="social-logins text-center">
 						<p class="text-muted login-divider">{{ _("or") }}</p>
 						<div class="social-login-buttons">
@@ -131,6 +131,10 @@
 		<div class="login-content page-card">
 			{{ logo_section() }}
 			{%- if not disable_signup -%}
+
+			{% if custom_signup_form %}
+			{{ custom_signup_form }}
+			{% else %}
 			<form class="form-signin form-signup hide" role="form">
 				<div class="page-card-body">
 					<div class="form-group">
@@ -153,6 +157,8 @@
 					</p>
 				</div>
 			</form>
+			{% endif %}
+
 			{%- else -%}
 			<div class='page-card-head mb-2'>
 				<span class='indicator gray'>{{_("Signup Disabled")}}</span>
diff --git a/frappe/www/login.py b/frappe/www/login.py
index 261e4d72af..2b54fec83a 100644
--- a/frappe/www/login.py
+++ b/frappe/www/login.py
@@ -39,6 +39,13 @@ def get_context(context):
 		frappe.get_hooks("app_logo_url")[-1])
 	context["app_name"] = (frappe.db.get_single_value('Website Settings', 'app_name') or
 		frappe.get_system_settings("app_name") or _("Frappe"))
+
+	custom_signup = frappe.get_hooks("custom_signup_form")
+	if custom_signup:
+		path = frappe.get_attr(custom_signup[0])()
+		if path:
+			context["custom_signup_form"] = frappe.get_template(path).render()
+
 	providers = [i.name for i in frappe.get_all("Social Login Key", filters={"enable_social_login":1}, order_by="name")]
 	for provider in providers:
 		client_id, base_url = frappe.get_value("Social Login Key", provider, ["client_id", "base_url"])