Refactor User/Account Update Callbacks