From 57135761cab74df24ad7bffb1914141603236f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Sat, 25 Jul 2020 09:26:08 -0400
Subject: [PATCH] fix: move check inside lock

---
 src/user/create.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/user/create.js b/src/user/create.js
index a205851323c4..352ac000d9ac 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -15,13 +15,14 @@ module.exports = function (User) {
 			data.email = String(data.email).trim();
 		}
 
-		await User.isDataValid(data);
-
 		try {
 			await lock(data.username, '[[error:username-taken]]');
 			if (data.email) {
 				await lock(data.email, '[[error:email-taken]]');
 			}
+
+			await User.isDataValid(data);
+
 			return await create(data);
 		} finally {
 			await db.deleteObjectFields('locks', [data.username, data.email]);