add user creation on first login
fix merge conflict
Merge pull request #13 from callapatel/crystal

Crystal