Better validation on User.
Merge branch 'hotfix/0.0.8'