diff --git a/backend/src/Datarekisteri/Backend/API.hs b/backend/src/Datarekisteri/Backend/API.hs
index 29bc321..5c95b22 100644
--- a/backend/src/Datarekisteri/Backend/API.hs
+++ b/backend/src/Datarekisteri/Backend/API.hs
@@ -255,6 +255,7 @@ data Token m = Token
     , issued :: m Time
     , expires :: m (Maybe Time)
     , permissions :: m [ScopePermission]
+    , owner :: m (User m)
     } deriving (Generic, GQLType)
 
 data Query m = Query
@@ -304,7 +305,7 @@ dbPGPKeyToPGPKey DBPGPKey {..} = PGPKey
     , comment = dbPGPKeyComment
     }
 
-dbTokenToToken :: Monad m => DBToken m -> Token m
+dbTokenToToken :: (MonadPermissions m, MonadError GQLError m) => DBToken m -> Token m
 dbTokenToToken DBToken {..} = Token
     { id = dbTokenId
     , name = dbTokenName
@@ -313,6 +314,7 @@ dbTokenToToken DBToken {..} = Token
     , issued = dbTokenIssued
     , expires = dbTokenExpires
     , permissions = fromPermissions <$> dbTokenPermissions
+    , owner = dbUserToUser <$> dbTokenUser
     }
 
 inputPermissionsToPermissions :: [InputScopePermission] -> Permissions
diff --git a/frontend/schema.gql b/frontend/schema.gql
index 3768e0e..f696142 100644
--- a/frontend/schema.gql
+++ b/frontend/schema.gql
@@ -49,6 +49,7 @@ type Token {
   issued: Time!
   expires: Time
   permissions: [ScopePermission!]!
+  owner: User!
 }
 
 type User {