diff --git a/libfreerdp-auth/credssp.c b/libfreerdp-auth/credssp.c
index 7dcc20915..d0c0cc47e 100644
--- a/libfreerdp-auth/credssp.c
+++ b/libfreerdp-auth/credssp.c
@@ -388,7 +388,7 @@ int credssp_client_authenticate(rdpCredssp* credssp)
 
 	/* Free resources */
 
-	sspi_SecBufferFree(&credssp->negoToken);
+	//sspi_SecBufferFree(&credssp->negoToken);
 	sspi_SecBufferFree(&credssp->authInfo);
 
 	FreeCredentialsHandle(&credentials);
diff --git a/libfreerdp-auth/sspi.c b/libfreerdp-auth/sspi.c
index 0e3019d59..7fb53db67 100644
--- a/libfreerdp-auth/sspi.c
+++ b/libfreerdp-auth/sspi.c
@@ -195,6 +195,7 @@ void sspi_SecBufferFree(SEC_BUFFER* sec_buffer)
 {
 	sec_buffer->cbBuffer = 0;
 	xfree(sec_buffer->pvBuffer);
+	sec_buffer->pvBuffer = NULL;
 }
 
 SEC_HANDLE* sspi_SecureHandleAlloc()