Remove dependency on userid creation