fixed user being null
Merge branch 'master' of https://github.com/adamtrinh/firebirdpresort-website/