We're currently implementing external authentication, and part of that is to add a 'username' column to users, since not all authentication servers use email as the unique identifier.
So I'm already in progress doing this on HEAD (nothing committed yet). We should definitely coordinate.
