Fixed the unquote when user/password is None