Fix an incorrect ssh password request

[tleedjarv]

Fix an oversight from #886 which under special circumstances caused a password to be incorrectly requested when one was not needed.

Fixes #917