Use correct order for username when using Keystone