diff --git a/lib/new-admin/admin-server.js b/lib/new-admin/admin-server.js
index b4c88651..93cf01ad 100644
--- a/lib/new-admin/admin-server.js
+++ b/lib/new-admin/admin-server.js
@@ -42,9 +42,9 @@ app.use(cookieParser())
 app.use(express.json())
 app.use(express.urlencoded({ extended: true })) // support encoded bodies
 app.use(express.static(path.resolve(__dirname, '..', '..', 'public')))
-app.use(computeSchema)
 app.use(cleanUserSessions(USER_SESSIONS_CLEAR_INTERVAL))
 app.use(session)
+app.use(computeSchema)
 
 const apolloServer = new ApolloServer({
   typeDefs,
diff --git a/lib/users.js b/lib/users.js
index b11a0bf3..3eaa1b74 100644
--- a/lib/users.js
+++ b/lib/users.js
@@ -59,7 +59,7 @@ function verifyAndUpdateUser (id, ua, ip) {
     .then(user => {
       if (!user) return null
 
-      const sql2 = `UPDATE users SET last_accessed=now(), last_accessed_from=$1, last_accessed_address=$2 WHERE id=$3 RETURNING id, role, enabled`
+      const sql2 = `UPDATE users SET last_accessed=now(), last_accessed_from=$1, last_accessed_address=$2 WHERE id=$3 RETURNING id, username, role, enabled`
       return db.one(sql2, [ua, ip, id])
     })
     .then(user => user)