diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js
index 978988ed..a0cd0ec1 100755
--- a/app/controllers/users/users.authentication.server.controller.js
+++ b/app/controllers/users/users.authentication.server.controller.js
@@ -41,6 +41,13 @@ var config_nev = function () {
 	        html: '<p>Your account has been successfully verified.</p>',
 	        text: 'Your account has been successfully verified.'
 	    },
+	    verifySendMailCallback: function(err, info) {
+	      if (err) {
+	        throw err;
+	      } else {
+	        console.log(info);
+	      }
+	    },
 
 	});
 	nev.generateTempUserModel(User);
@@ -60,7 +67,7 @@ exports.validateVerificationToken = function(req, res){
 	        res.status(200).send('User successfully verified');
 	    }else {
 	        // redirect to resend verification email
-	        res.status(400).send( {message: 'Verification token is invalid or has expired'} );
+	        return res.status(400).send( {message: 'Verification token is invalid or has expired'} );
 	    }
 	});
 };
@@ -68,6 +75,7 @@ exports.validateVerificationToken = function(req, res){
 exports.resendVerificationEmail = function(req, res, next){
 	nev.resendVerificationEmail(req.body.email, function(err, userFound) {
 		if(err) { 
+			console.log(errorHandler.getErrorMessage(err));
 			res.status(500).send( {message: errorHandler.getErrorMessage(err)  } );
 	    }else if (userFound){
 	        res.status(200).send('Verification email successfully Re-Sent');
diff --git a/config/env/development.js b/config/env/development.js
index dd2875fa..84b7da5c 100755
--- a/config/env/development.js
+++ b/config/env/development.js
@@ -47,9 +47,9 @@ module.exports = {
 		callbackURL: '/auth/github/callback'
 	},
 	mailer: {
-		from: process.env.MAILER_FROM || '',
+		from: process.env.MAILER_FROM || 'no-reply@kioskform.herokuapp.com',
 		options: {
-			service: process.env.MAILER_SERVICE_PROVIDER || 'no-reply@kioskform.herokuapp.com',
+			service: process.env.MAILER_SERVICE_PROVIDER || '',
 			auth: {
 				user: process.env.MAILER_EMAIL_ID || '',
 				pass: process.env.MAILER_PASSWORD || ''
diff --git a/config/env/production.js b/config/env/production.js
index 1b6099e3..9e3e29ff 100755
--- a/config/env/production.js
+++ b/config/env/production.js
@@ -65,9 +65,9 @@ module.exports = {
 		callbackURL: '/auth/github/callback'
 	},
 	mailer: {
-		from: process.env.MAILER_FROM || '',
+		from: process.env.MAILER_FROM || 'no-reply@kioskform.herokuapp.com',
 		options: {
-			service: process.env.MAILER_SERVICE_PROVIDER || 'no-reply@kioskform.herokuapp.com',
+			service: process.env.MAILER_SERVICE_PROVIDER || '',
 			auth: {
 				user: process.env.MAILER_EMAIL_ID || '',
 				pass: process.env.MAILER_PASSWORD || ''
diff --git a/public/modules/users/controllers/password.client.controller.js b/public/modules/users/controllers/password.client.controller.js
index 75660b05..a8382270 100755
--- a/public/modules/users/controllers/password.client.controller.js
+++ b/public/modules/users/controllers/password.client.controller.js
@@ -2,6 +2,7 @@
 
 angular.module('users').controller('PasswordController', ['$scope', '$stateParams', '$state', 'User',
 	function($scope, $stateParams, $state, User) {
+		$scope.error = '';
 		
 		// Submit forgotten password account id
 		$scope.askForPasswordReset = function() {
diff --git a/public/modules/users/controllers/verify.client.controller.js b/public/modules/users/controllers/verify.client.controller.js
index 2d7053d9..784115d7 100644
--- a/public/modules/users/controllers/verify.client.controller.js
+++ b/public/modules/users/controllers/verify.client.controller.js
@@ -5,7 +5,7 @@ angular.module('users').controller('VerifyController', ['$scope', '$state', '$ro
 
 		$scope.isReset = false;
 		$scope.credentials = {};
-		
+		$scope.error = '';
 
 		// Submit forgotten password account id
 		$scope.resendVerifyEmail = function() {
diff --git a/public/modules/users/views/verify/resend-verify-email.client.view.html b/public/modules/users/views/verify/resend-verify-email.client.view.html
index cb7cbe8e..3229103a 100644
--- a/public/modules/users/views/verify/resend-verify-email.client.view.html
+++ b/public/modules/users/views/verify/resend-verify-email.client.view.html
@@ -32,7 +32,7 @@
 			<p>Check your email and click on the activation link to activate your account. If you have any questions drop us a line at <a href="mail:hi@NodeForms.com">hi@NodeForms.com</a></p>
 			<div class="text-center form-group">
 					<button type="submit" class="btn btn-large btn-primary">
-						<a href="/#!/">Continue</a>
+						<a href="/#!/" style="color:white;">Continue</a>
 					</button>
 			</div>
 		</div>