diff --git a/src/user/create.js b/src/user/create.js
index db09c11b97..1a6e2a40e8 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -53,26 +53,14 @@ module.exports = function(User) {
 				renamedUsername: function(next) {
 					renameUsername(userData, next);
 				},
-				customFields: function(next) {
-					plugins.fireHook('filter:user.custom_fields', [], next);
-				},
 				userData: function(next) {
-					plugins.fireHook('filter:user.create', userData, next);
+					plugins.fireHook('filter:user.create', {user: userData, data: data}, next);
 				}
 			}, function(err, results) {
 				if (err) {
 					return callback(err);
 				}
 
-				var customData = {};
-				results.customFields.forEach(function(customField) {
-					if (data[customField]) {
-						customData[customField] = data[customField];
-					}
-				});
-
-				userData = utils.merge(results.userData, customData);
-
 				var userNameChanged = !!results.renamedUsername;
 
 				if (userNameChanged) {