Jag/users slave setup fix