before user model change
fixes