Fixed new login setup errors to work better.