diff --git a/packages/rocketchat-lib/server/functions/saveUser.js b/packages/rocketchat-lib/server/functions/saveUser.js
index 7b90595fab8..9f9c49e91f2 100644
--- a/packages/rocketchat-lib/server/functions/saveUser.js
+++ b/packages/rocketchat-lib/server/functions/saveUser.js
@@ -1,3 +1,4 @@
+/* globals Gravatar */
 RocketChat.saveUser = function(userId, userData) {
 	const user = RocketChat.models.Users.findOneById(userId);
 	let existingRoles = _.pluck(RocketChat.authz.getRoles(), '_id');
@@ -119,6 +120,13 @@ RocketChat.saveUser = function(userId, userData) {
 			});
 		}
 
+		userData._id = _id;
+
+		if (RocketChat.settings.get('Accounts_SetDefaultAvatar') === true && userData.email) {
+			let gravatarUrl = Gravatar.imageUrl(userData.email, {default: '404', size: 200, secure: true});
+			RocketChat.setUserAvatar(userData, gravatarUrl, '', 'url');
+		}
+
 		return _id;
 	} else {
 		// update user