diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js
index faf55a4a..a02ab6cb 100755
--- a/app/controllers/users/users.authentication.server.controller.js
+++ b/app/controllers/users/users.authentication.server.controller.js
@@ -101,6 +101,7 @@ exports.resendVerificationEmail = function(req, res, next){
  * Signup
  */
 exports.signup = function(req, res) {
+	debugger;
 
 	// For security measures we remove the roles from the req.body object
 	delete req.body.roles;
diff --git a/config/env/all.js b/config/env/all.js
index 43427ca5..292cd833 100755
--- a/config/env/all.js
+++ b/config/env/all.js
@@ -14,7 +14,7 @@ module.exports = {
 
 	reCAPTCHA_Key: process.env.reCAPTCHA_KEY || '',
 
-    signupDisabled: !!process.env.SIGNUP_DISABLED,
+    signupDisabled: (process.env.SIGNUP_DISABLED === "TRUE"),
 	baseUrl: '',
 	tempUserCollection: 'temporary_users',
 
diff --git a/public/modules/users/views/verify/verify-account.client.view.html b/public/modules/users/views/verify/verify-account.client.view.html
index d7d663b0..f6f9c0ac 100644
--- a/public/modules/users/views/verify/verify-account.client.view.html
+++ b/public/modules/users/views/verify/verify-account.client.view.html
@@ -5,6 +5,9 @@
 			<div class="col-md-12 text-center" style="padding-bottom: 50px;">
 				<img src="/static/modules/core/img/logo_white.svg" height="100px">
 			</div>
+			<h3 class="col-md-12">
+				{{ 'VERIFY_SUCCESS' | translate }}
+			</h3>
 			<div class="col-md-12">
 				<a href="/#!/signin" class="btn btn-signup btn-rounded btn-block">{{ 'CONTINUE_TO_LOGIN' | translate }}</a>
 			</div>