diff --git a/src/server/middleware/auth/gmeauth.js b/src/server/middleware/auth/gmeauth.js
index <HASH>..<HASH> 100644
--- a/src/server/middleware/auth/gmeauth.js
+++ b/src/server/middleware/auth/gmeauth.js
@@ -496,7 +496,8 @@ function GMEAuth(session, gmeConfig) {
                 var i;
                 for (i = 0; i < userDataArray.length; i += 1) {
                     delete userDataArray[i].passwordHash;
-                    // TODO: Consider removing settings and data here.
+                    userDataArray[i].data = userDataArray[i].data || {};
+                    userDataArray[i].settings = userDataArray[i].settings || {};
                 }
                 return userDataArray;
             })
WIP gmeAuth.listUsers should add settings and data. (#<I>)

should be cherry picked to <I>

Former-commit-id: <I>aef<I>fcd<I>fb<I>bc<I>ab<I>d<I>a<I>a<I>