Fix bug where we overwrote client model on edit before successful server call.