Removed useless user change fn
Fixed bad user event handling