diff --git a/admin/user_list.php b/admin/user_list.php
index 64d303718..9d1b90629 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -113,9 +113,9 @@ SELECT
 
 $query = '
 SELECT
-    username
+    '.$conf['user_fields']['username'].' AS username
     FROM '.USERS_TABLE.'
-    WHERE id = '.$conf['webmaster_id'].'
+    WHERE '.$conf['user_fields']['id'].' = '.$conf['webmaster_id'].'
 ;';
 
 $owner_username = query2array($query, null, 'username');