diff --git a/src/user/create.js b/src/user/create.js
index 1b18281722..ee4c3f27e7 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -109,11 +109,13 @@ module.exports = function (User) {
 		}
 
 		if (data.email && userData.uid > 1) {
-			await User.email.sendValidationEmail(userData.uid, {
-				email: data.email,
-				template: 'welcome',
-				subject: `[[email:welcome-to, ${meta.config.title || meta.config.browserTitle || 'NodeBB'}]]`,
-			}).catch(err => winston.error(`[user.create] Validation email failed to send\n[emailer.send] ${err.stack}`));
+			if (!data.token || !await User.isInviteTokenValid(data.token, data.email)) {
+				await User.email.sendValidationEmail(userData.uid, {
+					email: data.email,
+					template: 'welcome',
+					subject: `[[email:welcome-to, ${meta.config.title || meta.config.browserTitle || 'NodeBB'}]]`,
+				}).catch(err => winston.error(`[user.create] Validation email failed to send\n[emailer.send] ${err.stack}`));
+			}
 		}
 		if (userNameChanged) {
 			await User.notifications.sendNameChangeNotification(userData.uid, userData.username);
diff --git a/src/user/invite.js b/src/user/invite.js
index a9a5368bb1..344e09fd6b 100644
--- a/src/user/invite.js
+++ b/src/user/invite.js
@@ -72,6 +72,12 @@ module.exports = function (User) {
 		}
 	};
 
+	User.isInviteTokenValid = async function (token, enteredEmail) {
+		if (!token) return false;
+		const email = await db.getObjectField(`invitation:token:${token}`, 'email');
+		return email && email === enteredEmail;
+	};
+
 	User.confirmIfInviteEmailIsUsed = async function (token, enteredEmail, uid) {
 		if (!enteredEmail) {
 			return;