diff --git a/server/configuration/accounts_meld.coffee b/server/configuration/accounts_meld.coffee
index f6c3c22bfdb..8dfe3828d8c 100644
--- a/server/configuration/accounts_meld.coffee
+++ b/server/configuration/accounts_meld.coffee
@@ -17,6 +17,10 @@ Accounts.updateOrCreateUserFromExternalService = (serviceName, serviceData, opti
 	if serviceName is 'linkedin'
 		serviceData.email = serviceData.emailAddress
 
+	if serviceName is 'sandstorm'
+		console.log "Grab data from: ", serviceData
+		serviceData.username = serviceData.preferredHandle
+
 	if serviceData.email
 
 		# Remove not verified users that have same email
diff --git a/server/methods/getUsernameSuggestion.coffee b/server/methods/getUsernameSuggestion.coffee
index 826cdcae4de..7e24d881ef8 100644
--- a/server/methods/getUsernameSuggestion.coffee
+++ b/server/methods/getUsernameSuggestion.coffee
@@ -15,6 +15,10 @@ usernameIsAvaliable = (username) ->
 	usernames = []
 	username = undefined
 
+	if Meteor.settings.public.sandstorm
+		console.log "preferredHandle: ", user.services.sandstorm.preferredHandle
+		return user.services.sandstorm.preferredHandle
+
 	if RocketChat.settings.get 'UTF8_Names_Slugify'
 		usernames.push slug user.name
 	else
diff --git a/server/startup/avatar.coffee b/server/startup/avatar.coffee
index 4951142cb4f..142f33b03c0 100644
--- a/server/startup/avatar.coffee
+++ b/server/startup/avatar.coffee
@@ -43,6 +43,10 @@ Meteor.startup ->
 		res.setHeader 'Content-Disposition', 'inline'
 
 		if not file?
+
+			if Meteor.settings.public.sandstorm
+				console.log "Should redirect to: ", RocketChat.models.Users.findOneByUsername(params.username.replace('.jpg', '')).services.sandstorm.picture
+
 			res.setHeader 'Content-Type', 'image/svg+xml'
 			res.setHeader 'Cache-Control', 'public, max-age=0'
 			res.setHeader 'Expires', '-1'