diff --git a/src/main/html/webapp/components/core/user/signup/signup.js b/src/main/html/webapp/components/core/user/signup/signup.js
index 475bfefc..170a9e42 100644
--- a/src/main/html/webapp/components/core/user/signup/signup.js
+++ b/src/main/html/webapp/components/core/user/signup/signup.js
@@ -93,7 +93,16 @@ export default Control.extend({
       success: function(data) {
         if (data.success == true) {
           // shows success
+
+          var message = "";
+          if (!anonymous){
+            message = "Well done!</b> An email including the activation code has been sent to your address."
+          } else {
+            message = "<b>Well done!</b> Your account is now active. <a href=\"/\">Login now</a>."
+          }
+
           $('#signon-form').hide();
+          $('#success-message').html(message);
           $('#success-message').show();
         } else {
           // shows error msg
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 1428bf09..d33b55a0 100644
--- a/src/main/html/webapp/components/core/user/signup/signup.stache
+++ b/src/main/html/webapp/components/core/user/signup/signup.stache
@@ -2,12 +2,6 @@
 <br>
 
 <div class="alert alert-success" id="success-message" style="display: none;">
-  {{#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>
 
 <form id="signon-form" class="form-horizontal" autocomplete="off">