During initial setup, accidentally choosing "enter password" for the UI password setting locks you out.

Etched a brand new version of 9.3 to SD card, booted up Pi, on initial setup if you accidentally choose to use a UI password it automatically saves and will lock you out unless you know the default password.

Is it possible to change this behavior so that choosing a password whether by choice or accident that it will not save automatically and will wait for a save or "finish setup".
