Actually, while you're at this, can you please use the `username` output field of authserver `/user_info` instead of stripping "user-", both here and in `dx login` without --token? That's the preferred way to get the username.