diff --git a/lib/middleware.js b/lib/middleware.js
index 5e9443c2..56978774 100644
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -52,10 +52,16 @@ module.exports = function(srf, logger) {
     let clientDb = null;
     if (req.has('X-Authenticated-User')) {
       req.locals.originatingUser = req.get('X-Authenticated-User');
+      let clientSettings;
       const arr = /^(.*)@(.*)/.exec(req.locals.originatingUser);
       if (arr) {
-        [clientDb] = await lookupClientByAccountAndUsername(account_sid, arr[1]);
+        [clientSettings] = await lookupClientByAccountAndUsername(account_sid, arr[1]);
       }
+      clientDb = await registrar.query(req.locals.originatingUser);
+      clientDb = {
+        ...clientDb,
+        ...clientSettings,
+      };
     }
 
     // check for call to application