Improve user model validation