From 41d7e731e4cfba69acd7fb9e3ea1760303219209 Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Thu, 22 Nov 2018 09:34:23 -0200
Subject: [PATCH] Set username before try to set user avatar to avoid username
 undefined

---
 packages/rocketchat-lib/server/functions/setUsername.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-lib/server/functions/setUsername.js b/packages/rocketchat-lib/server/functions/setUsername.js
index b9fa77799398..109a7f4e6ecd 100644
--- a/packages/rocketchat-lib/server/functions/setUsername.js
+++ b/packages/rocketchat-lib/server/functions/setUsername.js
@@ -35,6 +35,8 @@ RocketChat._setUsername = function(userId, u) {
 	} catch (e) {
 		console.error(e);
 	}
+	// Set new username*
+	RocketChat.models.Users.setUsername(user._id, username);
 	/* globals getAvatarSuggestionForUser */
 	user.username = username;
 	if (!previousUsername && RocketChat.settings.get('Accounts_SetDefaultAvatar') === true) {
@@ -75,8 +77,6 @@ RocketChat._setUsername = function(userId, u) {
 			fileStore.model.updateFileNameById(file._id, username);
 		}
 	}
-	// Set new username*
-	RocketChat.models.Users.setUsername(user._id, username);
 	return user;
 };