fixed user edit and event edit