Better fix for /setup bug where User doesn't exist. #1546