Fix/usercycle

cc @calvinfo second half of moving usercycle to the server-side