fix user model issues