Feature/1 fix user model for 1.7