Make the error on passwords float up to the key_deploy catch

This fixes a number of issues, including the password prompt being clobbered #10613

Or rather this finishes fixing them