diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 899da712f7..2751183c3e 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -1252,7 +1252,7 @@ pg_SSPI_recvauth(Port *port)
 
 	if (!GetTokenInformation(token, TokenUser, tokenuser, retlen, &retlen))
 		ereport(ERROR,
-				(errmsg_internal("could not get user token: error code %lu",
+				(errmsg_internal("could not get token user: error code %lu",
 								 GetLastError())));
 
 	CloseHandle(token);
diff --git a/src/common/exec.c b/src/common/exec.c
index 927d03c3b7..ec8c655636 100644
--- a/src/common/exec.c
+++ b/src/common/exec.c
@@ -672,13 +672,10 @@ AddUserToTokenDacl(HANDLE hToken)
 		goto cleanup;
 	}
 
-	/*
-	 * Get the user token for the current user, which provides us with the SID
-	 * that is needed for creating the ACL.
-	 */
+	/* Get the current user SID */
 	if (!GetTokenUser(hToken, &pTokenUser))
 	{
-		log_error("could not get user token: error code %lu", GetLastError());
+		log_error("could not get token user: error code %lu", GetLastError());
 		goto cleanup;
 	}