Change Username to Email to fix puush login, fixes #6