Fyou are absolutely right, i think this is something we had espcially in previous versions when all the users were suffixed with the organization, but as this is not the default anymore, it would also make sense to change that for the admin user.
Fit could just simple be zitadel-admin