diff --git a/client/sql/15_config_management.sql b/client/sql/15_config_management.sql
index d1e92f5..7e03c3f 100644
--- a/client/sql/15_config_management.sql
+++ b/client/sql/15_config_management.sql
@@ -25,16 +25,11 @@ BEGIN
     IF is_organization IS NULL THEN
         RAISE EXCEPTION 'User must have user configuration in the config table';
     ELSIF is_organization = TRUE THEN
-        SELECT nspname
-        FROM pg_namespace s
-        LEFT JOIN pg_roles r ON s.nspowner = r.oid
-        WHERE r.rolname = session_user INTO username;
         SELECT cartodb.cdb_conf_getconf('user_config')->>'entity_name' INTO organization_name;
     ELSE
-        SELECT cartodb.cdb_conf_getconf('user_config')->>'entity_name' INTO username;
         organization_name = NULL;
     END IF;
-    result.username = username;
+    result.username = apikey_config->'username';
     result.organization_name = organization_name;
     result.apikey_permissions = apikey_config->'permissions';
     RETURN result;