diff --git a/src/oidc.js b/src/oidc.js
index 9f5306816..fc2256aeb 100644
--- a/src/oidc.js
+++ b/src/oidc.js
@@ -313,7 +313,6 @@ function attachInteractionRoutes(routePrefix, app, provider) {
         debug(`route interaction login post result redirectTo:${redirectTo}`);
 
         res.status(200).send({ redirectTo });
-        // next(new HttpSuccess(200, { redirectTo }));
     });
 
     app.post(routePrefix + '/interaction/:uid/confirm', json, setNoCache, async (req, res, next) => {
@@ -401,7 +400,7 @@ async function claims(userId, use, scope) {
     const firstName = nameParts[0];
     const lastName = nameParts.length > 1  ? nameParts[nameParts.length - 1] : ''; // choose last part, if it exists
 
-    return {
+    const claims = {
         sub: userId, // it is essential to always return a sub claim
         email: user.email,
         email_verified: true,
@@ -409,8 +408,12 @@ async function claims(userId, use, scope) {
         given_name: firstName,
         locale: 'en-US',
         name: user.displayName,
-        preferred_username: user.username,
+        preferred_username: user.username
     };
+
+    debug(`claims: userId:${userId} result`, claims);
+
+    return claims;
 }
 
 async function getProvider(routePrefix) {
@@ -419,9 +422,8 @@ async function getProvider(routePrefix) {
     const { Provider } = await import('oidc-provider');
 
     const configuration = {
-        // use the one from Account class I guess?
         async findAccount(ctx, id) {
-            debug(`findAccount id:${id}`, ctx);
+            debug(`findAccount id:${id}`);
 
             return {
                 accountId: id,