Changed order of option parsing so that password will only be requested if there is a command specified.