updated branch with master
email on register