Updated user edit and update to handle changes