Fixed issue when supplying password via CLI