Return code even if bare username
Merge remote-tracking branch 'kali/bug/3405_return_for_bare_username' into develop