fix unable to sign_up
Merge branch 'email_on_approve'