diff --git a/src/auth/trusted/AuthSspi.cpp b/src/auth/trusted/AuthSspi.cpp
index a7992d2572..f8437c6c61 100644
--- a/src/auth/trusted/AuthSspi.cpp
+++ b/src/auth/trusted/AuthSspi.cpp
@@ -388,7 +388,6 @@ Result WinSspiServerInstance::contAuthentication(WriterInterface* writerInterfac
 {
 	sspiData.clear();
 	sspiData.add(data, size);
-	sspi.accept(sspiData);
 
 	if (!sspi.accept(sspiData))
 	{
@@ -452,8 +451,8 @@ Result WinSspiClientInstance::contAuthentication(const unsigned char* data, unsi
 {
 	sspiData.clear();
 	sspiData.add(data, size);
-	sspi.accept(sspiData);
-	if (!sspi.accept(sspiData))
+
+	if (!sspi.request(sspiData))
 	{
 		return AUTH_FAILED;
 	}
diff --git a/src/remote/interface.cpp b/src/remote/interface.cpp
index d9df80b5aa..9f5f88d3c4 100644
--- a/src/remote/interface.cpp
+++ b/src/remote/interface.cpp
@@ -5729,7 +5729,7 @@ static bool init(ISC_STATUS* user_status,
 		}
 
 		bool contFlag = true;
-		if (n && n->cstr_length)
+		if (!n || !n->cstr_length)
 		{
 			// switch to other plugin
 			currentInstance.reset(0);