diff --git a/src/routes/users.js b/src/routes/users.js
index b0db67201..5df200c63 100644
--- a/src/routes/users.js
+++ b/src/routes/users.js
@@ -55,10 +55,10 @@ async function add(req, res, next) {
     const username = 'username' in req.body ? req.body.username : null;
     const displayName = req.body.displayName || '';
 
-    const [error, user] = await safe(users.add(email, { username, password, displayName, invitor: req.user, role: req.body.role || users.ROLE_USER }, auditSource.fromRequest(req)));
+    const [error, id] = await safe(users.add(email, { username, password, displayName, invitor: req.user, role: req.body.role || users.ROLE_USER }, auditSource.fromRequest(req)));
     if (error) return next(BoxError.toHttpError(error));
 
-    next(new HttpSuccess(201, users.removePrivateFields(user)));
+    next(new HttpSuccess(201, { id }));
 }
 
 async function update(req, res, next) {
diff --git a/src/test/common.js b/src/test/common.js
index 2927a5468..6b842ca66 100644
--- a/src/test/common.js
+++ b/src/test/common.js
@@ -8,7 +8,6 @@ const appdb = require('../appdb.js'),
     database = require('../database.js'),
     domains = require('../domains.js'),
     fs = require('fs'),
-    hat = require('../hat.js'),
     mail = require('../mail.js'),
     mailboxdb = require('../mailboxdb.js'),
     mailer = require('../mailer.js'),
@@ -177,13 +176,13 @@ function setup(done) {
         domainSetup,
         async function createOwner() {
             const result = await users.createOwner(ADMIN.email, ADMIN.username, ADMIN.password, ADMIN.displayName, AUDIT_SOURCE);
-            ADMIN.id = result.id;
+            ADMIN.id = result;
         },
         appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.domain, APP.portBindings, APP),
         settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, exports.APPSTORE_TOKEN), // appstore token
         async function createUser() {
             const result = await users.add(USER.email, USER, AUDIT_SOURCE);
-            USER.id = result.id;
+            USER.id = result;
         },
         (done) => mailboxdb.addMailbox(exports.MAILBOX_NAME, DOMAIN.domain, { ownerId: USER.id, ownerType: mail.OWNERTYPE_USER, active: true }, done),
         (done) => mailboxdb.setAliasesForName(exports.MAILBOX_NAME, DOMAIN.domain, [ { name: exports.ALIAS_NAME, domain: DOMAIN.domain} ], done),