diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 796dd2dc750e2..3af464db72f3d 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -197,14 +197,20 @@ public function __construct($renderAs, $appId = '') {
 			if ($showSimpleSignup && $subscription->delegateHasValidSubscription()) {
 				$showSimpleSignup = false;
 			}
-			$this->assign('showSimpleSignUpLink', $showSimpleSignup);
 
 			$urlGenerator = \OCP\Server::get(IURLGenerator::class);
-			$signUpLink = $this->config->getSystemValueString('registration_link', $urlGenerator->getAbsoluteURL('/index.php/signup/'));
+			$defaultSignUpLink = 'https://nextcloud.com/signup/';
+			$signUpLink = $this->config->getSystemValueString('registration_link', $defaultSignUpLink);
+			if ($signUpLink !== $defaultSignUpLink) {
+				$showSimpleSignup = true;
+			}
+
 			$appManager = \OCP\Server::get(IAppManager::class);
 			if ($appManager->isEnabledForUser('registration')) {
 				$signUpLink = $urlGenerator->getAbsoluteURL('/index.php/apps/registration/');
 			}
+
+			$this->assign('showSimpleSignUpLink', $showSimpleSignup);
 			$this->assign('signUpLink', $signUpLink);
 		} else {
 			parent::__construct('core', 'layout.base');