fixes for ambiguous password prompt on upgrade [#67952982]