Fixed #6577 - Preserve user input on error
(cherry picked from commit a654d899cd5d288501fea1ec52dba2e3f0e479ba)
Fixed #6577 - Preserve user input on error
(cherry picked from commit a654d899cd5d288501fea1ec52dba2e3f0e479ba)