put option handling back and allow to set username, password, etc from the command line (useful for testing)