Creating new OnDemand instances from Google Apps populates the admin username incorrectly

When creating a new OD instance from Google Apps, the admin username is populated with the email address of the admin user, not the username. When logging in for the first time through Google, a new user is created that does not have administrator access, and because the original user is the same email address you are unable to login.

Example:

I am the administrator on my Google Apps domain, dave@mydomain.com, and I go to create a new OnDemand instance from the Atlassian OnDemand app. This prefills the form with the admin user "dave@mydomain.com", and creates the OD instance with that as the username of the admin.

I then go to my new OnDemand instance, let's say daveisawesome.atlassian.net, and login via Google. Google sees that there are no users named "dave", so creates a new JIRA user with username "dave" and email "dave@mydomain.com", with only user-level access. If I try to login via JIRA, not using Google, using the user "dave@mydomain.com", I get the message that I'm trying to login with an email when I should be using my username.

Workaround

If you've already tried logging in via Google:
File a support ticket so that support can delete the original administrator login, and add the "dave" user to the administrators group.

If you have not yet logged in via Google:
Login to the OnDemand instance directly, not via Google, using your email address as the username "dave@mydomain.com". Create a new user, username dave, email "dave@mydomain.com", with administrator rights. When you login via Google, it will merge with that "dave" user and you can then remove or deactivate the original admin to free up the license seat.