diff --git a/pagure/__init__.py b/pagure/__init__.py
index 42a5012..078073b 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -298,10 +298,7 @@ def is_repo_admin(repo_obj):
 
     user = flask.g.fas_user.username
 
-    admin_users = APP.config.get('PAGURE_ADMIN_USERS', [])
-    if not isinstance(admin_users, list):
-        admin_users = [admin_users]
-    if user in admin_users:
+    if is_admin():
         return True
 
     usergrps = [
@@ -321,10 +318,7 @@ def is_repo_committer(repo_obj):
 
     user = flask.g.fas_user.username
 
-    admin_users = APP.config.get('PAGURE_ADMIN_USERS', [])
-    if not isinstance(admin_users, list):
-        admin_users = [admin_users]
-    if user in admin_users:
+    if is_admin():
         return True
 
     usergrps = [
@@ -344,10 +338,7 @@ def is_repo_user(repo_obj):
 
     user = flask.g.fas_user.username
 
-    admin_users = APP.config.get('PAGURE_ADMIN_USERS', [])
-    if not isinstance(admin_users, list):
-        admin_users = [admin_users]
-    if user in admin_users:
+    if is_admin():
         return True
 
     usergrps = [
diff --git a/pagure/api/__init__.py b/pagure/api/__init__.py
index c3c22aa..cd83a24 100644
--- a/pagure/api/__init__.py
+++ b/pagure/api/__init__.py
@@ -111,10 +111,16 @@ def check_api_acls(acls, optional=False):
             if acls and set(token.acls_list).intersection(set(acls)):
                 token_auth = True
                 flask.g.fas_user = token.user
+                # To get a token, in the `fas` auth user must have signed
+                # the CLA, so just set it to True
+                flask.g.fas_user.cla_done = True
                 flask.g.token = token
             elif not acls and optional:
                 token_auth = True
                 flask.g.fas_user = token.user
+                # To get a token, in the `fas` auth user must have signed
+                # the CLA, so just set it to True
+                flask.g.fas_user.cla_done = True
                 flask.g.token = token
     elif optional:
         return