added unique to email and removed username