Using username instead of email now