From 8fa4b2ef220339a9e8a2e92cd8fd7551fbf52106 Mon Sep 17 00:00:00 2001
From: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Thu, 27 Feb 2020 15:24:21 -0300
Subject: [PATCH] [FIX] Rocket.Chat takes too long to set the username when it
 fails to send enrollment email (#16723)

---
 app/lib/server/functions/setUsername.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/lib/server/functions/setUsername.js b/app/lib/server/functions/setUsername.js
index d705d436c08..7656e7dbe4a 100644
--- a/app/lib/server/functions/setUsername.js
+++ b/app/lib/server/functions/setUsername.js
@@ -41,7 +41,9 @@ export const _setUsername = function(userId, u) {
 	// If first time setting username, send Enrollment Email
 	try {
 		if (!previousUsername && user.emails && user.emails.length > 0 && settings.get('Accounts_Enrollment_Email')) {
-			Accounts.sendEnrollmentEmail(user._id);
+			Meteor.defer(() => {
+				Accounts.sendEnrollmentEmail(user._id);
+			});
 		}
 	} catch (e) {
 		console.error(e);