diff --git a/src/users.js b/src/users.js
index b28fc1276..9f0fd464d 100644
--- a/src/users.js
+++ b/src/users.js
@@ -203,6 +203,12 @@ function create(username, password, email, displayName, options, auditSource, ca
                 if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new UsersError(UsersError.ALREADY_EXISTS, error.message));
                 if (error) return callback(new UsersError(UsersError.INTERNAL_ERROR, error));
 
+                // when this is used to create the owner, then we have to patch the auditSource to contain himself
+                if (isOwner) {
+                    auditSource.userId = user.id;
+                    auditSource.username = user.username;
+                }
+
                 eventlog.add(eventlog.ACTION_USER_ADD, auditSource, { userId: user.id, email: user.email, user: removePrivateFields(user), invitor: invitor });
 
                 callback(null, user);