user + hydrator fix