Escape username/password command line arguments

Proper fix and follow up on #168