Switch order of users setup to fix for 2.6.0