Fixed switches with spaces

for example password with a space in it.