Update to properly setup auth if password is supplied