Fixed argument parsing
Fixed password injection