Fix error where password is not being asked for first