check on email when registering
Merge branch 'Working_branch'