Quote password substitution (may contain spaces)

Continuation of previous commit (missed one).