When cf asks for "Email" it actually expects username

[michaelklishin]

When cf asks for "Email" (e.g. if you try to create org without doing cf login) it actually expects username: entering an email makes authentication fail, providing my username instead of email makes it succeed.

FTR, here's my SCIM users list from uaa.yml:

scim:
  users:
    - marissa|koala|marissa@test.org|Marissa|LastName|uaa.admin
    - michael|michaelpwd|michael@test.org|Michael|LastName|uaa.admin

[xoebus]

In the majority case, especially on run.pivotal.io, the value for username is email and the prompt produces more success among users trying to log in.

We'd like to see a solution that conveys the duality... "Username/Email>" for example.