Make events-ctrl update on user id update + code cleanup.