Changed everything to email instead of mixing that and username