fix naming issue + add validation on email model