diff --git a/src/main/html/webapp/components/core/user/signup/signup.stache b/src/main/html/webapp/components/core/user/signup/signup.stache
index cd91c95d..c4b6591d 100644
--- a/src/main/html/webapp/components/core/user/signup/signup.stache
+++ b/src/main/html/webapp/components/core/user/signup/signup.stache
@@ -2,7 +2,11 @@
 <br>
 
 <div class="alert alert-success" id="success-message" style="display: none;">
-  <b>Well done!</b> An email including the activation code has been sent to your address.
+  {{#is(emailRequired, true)}}
+    <b>Well done!</b> An email including the activation code has been sent to your address.
+  {{else}}
+    <b>Well done!</b> Your account is now active. <a href="/">Login now</a>.
+   {{/is}}
   <br>
 </div>