wip
Fix broken argument parser for the username|organization parameter. Closes: #772043