Update admin commands to have org space and username
[#59166936]