Update model validation + user update correction