Add email regex + check uniqueness

remove commented out code