Added unique email error message. Comment logic (again)