diff --git a/server/methods/getAvatarSuggestion.coffee b/server/methods/getAvatarSuggestion.coffee
index 5c48dc0d324..46f161327f1 100644
--- a/server/methods/getAvatarSuggestion.coffee
+++ b/server/methods/getAvatarSuggestion.coffee
@@ -31,6 +31,11 @@
 			service: 'gitlab'
 			url: user.services.gitlab.avatar_url
 
+	if user.services.sandstorm?.picture? and Meteor.settings.public.sandstorm
+		avatars.push
+			service: 'sandstorm'
+			url: user.services.sandstorm.picture
+
 	if user.emails?.length > 0
 		for email in user.emails when email.verified is true
 			avatars.push
diff --git a/server/methods/getUsernameSuggestion.coffee b/server/methods/getUsernameSuggestion.coffee
index 7e24d881ef8..06498b8bcb5 100644
--- a/server/methods/getUsernameSuggestion.coffee
+++ b/server/methods/getUsernameSuggestion.coffee
@@ -16,8 +16,7 @@ usernameIsAvaliable = (username) ->
 	username = undefined
 
 	if Meteor.settings.public.sandstorm
-		console.log "preferredHandle: ", user.services.sandstorm.preferredHandle
-		return user.services.sandstorm.preferredHandle
+		usernames.push user.services.sandstorm.preferredHandle
 
 	if RocketChat.settings.get 'UTF8_Names_Slugify'
 		usernames.push slug user.name