diff --git a/packages/rocketchat-lib/server/functions/saveUser.js b/packages/rocketchat-lib/server/functions/saveUser.js
index 35dffd07692..c4d1b4089b7 100644
--- a/packages/rocketchat-lib/server/functions/saveUser.js
+++ b/packages/rocketchat-lib/server/functions/saveUser.js
@@ -183,7 +183,7 @@ RocketChat.saveUser = function(userId, userData) {
 		}
 
 		if (userData.email) {
-			const shouldSendVerificationEmailToUser = !userData.verified;
+			const shouldSendVerificationEmailToUser = userData.verified !== true;
 			RocketChat.setEmail(userData._id, userData.email, shouldSendVerificationEmailToUser);
 		}
 
diff --git a/packages/rocketchat-lib/server/functions/setEmail.js b/packages/rocketchat-lib/server/functions/setEmail.js
index 779f860f184..9d1819cfd1f 100644
--- a/packages/rocketchat-lib/server/functions/setEmail.js
+++ b/packages/rocketchat-lib/server/functions/setEmail.js
@@ -1,6 +1,6 @@
 import s from 'underscore.string';
 
-RocketChat._setEmail = function(userId, email, shouldSendVerificationEmail) {
+RocketChat._setEmail = function(userId, email, shouldSendVerificationEmail = true) {
 	email = s.trim(email);
 	if (!userId) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user', { function: '_setEmail' });
@@ -27,7 +27,9 @@ RocketChat._setEmail = function(userId, email, shouldSendVerificationEmail) {
 	// Set new email
 	RocketChat.models.Users.setEmail(user._id, email);
 	user.email = email;
-	Meteor.call('sendConfirmationEmail', user.email, shouldSendVerificationEmail);
+	if (shouldSendVerificationEmail === true) {
+		Meteor.call('sendConfirmationEmail', user.email);
+	}
 	return user;
 };
 
diff --git a/server/methods/sendConfirmationEmail.js b/server/methods/sendConfirmationEmail.js
index 7172df75c76..82d761a970e 100644
--- a/server/methods/sendConfirmationEmail.js
+++ b/server/methods/sendConfirmationEmail.js
@@ -1,11 +1,11 @@
 Meteor.methods({
-	sendConfirmationEmail(email, shouldSendVerificationEmail = true) {
+	sendConfirmationEmail(email) {
 		check(email, String);
 		email = email.trim();
 
 		const user = RocketChat.models.Users.findOneByEmailAddress(email);
 
-		if (user && shouldSendVerificationEmail) {
+		if (user) {
 			if (RocketChat.settings.get('Verification_Customized')) {
 				const subject = RocketChat.placeholders.replace(RocketChat.settings.get('Verification_Email_Subject') || '');
 				const html = RocketChat.placeholders.replace(RocketChat.settings.get('Verification_Email') || '');