Add more handling in the registration
Merge branch 'master' of https://github.com/phamonyut/hoorayjob