diff --git a/services/auth.py b/services/auth.py
index 3d8a4663..a2746cda 100644
--- a/services/auth.py
+++ b/services/auth.py
@@ -85,14 +85,14 @@ def login_required(f):
         info = args[1]
         context = info.context
         req = context.get('request')
-        [user_id, user_roles] = (await check_auth(req)) or []
-        if user_id and user_roles:
-            logger.info(f' got {user_id} roles: {user_roles}')
-            context['user_id'] = user_id.strip()
-            context['roles'] = user_roles
-            return await f(*args, **kwargs)
-        else:
-            raise HTTPException(status_code=401, detail='Unauthorized')
+        authorized = await check_auth(req)
+        if authorized:
+            user_id, user_roles = authorized
+            if user_id and user_roles:
+                logger.info(f' got {user_id} roles: {user_roles}')
+                context['user_id'] = user_id.strip()
+                context['roles'] = user_roles
+                return await f(*args, **kwargs)
 
     return decorated_function
 
@@ -101,11 +101,14 @@ def auth_request(f):
     @wraps(f)
     async def decorated_function(*args, **kwargs):
         req = args[0]
-        [user_id, user_roles] = (await check_auth(req)) or []
-        if user_id:
-            req['user_id'] = user_id.strip()
-            req['roles'] = user_roles
-            return await f(*args, **kwargs)
+        authorized = await check_auth(req)
+        if authorized:
+            user_id, user_roles = authorized
+            if user_id and user_roles:
+                logger.info(f' got {user_id} roles: {user_roles}')
+                req['user_id'] = user_id.strip()
+                req['roles'] = user_roles
+                return await f(*args, **kwargs)
         else:
             raise HTTPException(status_code=401, detail='Unauthorized')