finally put the users in the right place