Fix: use the users entity