Fix issues with non-interactive mode prompting for new passwords