[PATCH 2/2] Fix reprompting and screen redrawing on invalid input