Fixes on double email send out
Merge branch 'master' of https://github.com/globeestate11/estate