diff --git a/server/lib/accounts.js b/server/lib/accounts.js
index a3f487a4d8a..a3a43fcfce5 100644
--- a/server/lib/accounts.js
+++ b/server/lib/accounts.js
@@ -123,10 +123,18 @@ Accounts.insertUserDoc = _.wrap(Accounts.insertUserDoc, function(insertUserDoc,
 		_id
 	});
 
-	if (user.username && options.joinDefaultChannels !== false && user.joinDefaultChannels !== false) {
-		Meteor.runAsUser(_id, function() {
-			return Meteor.call('joinDefaultChannels', options.joinDefaultChannelsSilenced);
-		});
+	if (user.username) {
+		if (options.joinDefaultChannels !== false && user.joinDefaultChannels !== false) {
+			Meteor.runAsUser(_id, function() {
+				return Meteor.call('joinDefaultChannels', options.joinDefaultChannelsSilenced);
+			});
+		}
+
+		if (user.type !== 'visitor') {
+			Meteor.defer(function() {
+				return RocketChat.callbacks.run('afterCreateUser', user);
+			});
+		}
 	}
 
 	if (roles.length === 0) {