diff --git a/src/services/grpc/account/v2/exchange-independent-service-token-for-user-data.ts b/src/services/grpc/account/v2/exchange-independent-service-token-for-user-data.ts
index 7d47673..28ab51b 100644
--- a/src/services/grpc/account/v2/exchange-independent-service-token-for-user-data.ts
+++ b/src/services/grpc/account/v2/exchange-independent-service-token-for-user-data.ts
@@ -110,7 +110,7 @@ export async function exchangeIndependentServiceTokenForUserData(request: Exchan
 			},
 			tokenInfo: {
 				systemType: serviceToken.info.system_type as any, // TODO - Stop the any usage
-				tokenType: serviceToken.info.system_type as any, // TODO - Stop the any usage
+				tokenType: serviceToken.info.token_type as any, // TODO - Stop the any usage
 				pid: BigInt(pnid.pid),
 				accessLevel: pnid.access_level,
 				titleId: serviceToken.info.title_id,
@@ -136,7 +136,7 @@ export async function exchangeIndependentServiceTokenForUserData(request: Exchan
 			},
 			tokenInfo: {
 				systemType: serviceToken.info.system_type as any, // TODO - Stop the any usage
-				tokenType: serviceToken.info.system_type as any, // TODO - Stop the any usage
+				tokenType: serviceToken.info.token_type as any, // TODO - Stop the any usage
 				pid: BigInt(nexAccount.pid),
 				accessLevel: nexAccount.access_level,
 				titleId: serviceToken.info.title_id,
diff --git a/src/services/grpc/account/v2/exchange-nex-token-for-user-data.ts b/src/services/grpc/account/v2/exchange-nex-token-for-user-data.ts
index 0f48b36..e39df29 100644
--- a/src/services/grpc/account/v2/exchange-nex-token-for-user-data.ts
+++ b/src/services/grpc/account/v2/exchange-nex-token-for-user-data.ts
@@ -48,7 +48,7 @@ export async function exchangeNEXTokenForUserData(request: ExchangeNEXTokenForUs
 			},
 			tokenInfo: {
 				systemType: nexToken.info.system_type as any, // TODO - Stop the any usage
-				tokenType: nexToken.info.system_type as any, // TODO - Stop the any usage
+				tokenType: nexToken.info.token_type as any, // TODO - Stop the any usage
 				pid: BigInt(nexAccount.pid),
 				accessLevel: nexAccount.access_level,
 				titleId: nexToken.info.title_id,
@@ -73,7 +73,7 @@ export async function exchangeNEXTokenForUserData(request: ExchangeNEXTokenForUs
 			},
 			tokenInfo: {
 				systemType: nexToken.info.system_type as any, // TODO - Stop the any usage
-				tokenType: nexToken.info.system_type as any, // TODO - Stop the any usage
+				tokenType: nexToken.info.token_type as any, // TODO - Stop the any usage
 				pid: BigInt(nexAccount.pid),
 				accessLevel: nexAccount.access_level,
 				titleId: nexToken.info.title_id,
diff --git a/src/services/grpc/account/v2/exchange-oauth-token-for-user-data.ts b/src/services/grpc/account/v2/exchange-oauth-token-for-user-data.ts
index da4b71f..3c6de65 100644
--- a/src/services/grpc/account/v2/exchange-oauth-token-for-user-data.ts
+++ b/src/services/grpc/account/v2/exchange-oauth-token-for-user-data.ts
@@ -108,7 +108,7 @@ export async function exchangeOAuthTokenForUserData(request: ExchangeOAuthTokenF
 		},
 		tokenInfo: {
 			systemType: oAuthToken.info.system_type as any, // TODO - Stop the any usage
-			tokenType: oAuthToken.info.system_type as any, // TODO - Stop the any usage
+			tokenType: oAuthToken.info.token_type as any, // TODO - Stop the any usage
 			pid: BigInt(pnid.pid),
 			accessLevel: pnid.access_level,
 			titleId: oAuthToken.info.title_id,
diff --git a/src/services/grpc/account/v2/exchange-password-reset-token-for-user-data.ts b/src/services/grpc/account/v2/exchange-password-reset-token-for-user-data.ts
index 2d2aa90..62f7dd0 100644
--- a/src/services/grpc/account/v2/exchange-password-reset-token-for-user-data.ts
+++ b/src/services/grpc/account/v2/exchange-password-reset-token-for-user-data.ts
@@ -104,7 +104,7 @@ export async function exchangePasswordResetTokenForUserData(request: ExchangePas
 		},
 		tokenInfo: {
 			systemType: passwordResetToken.info.system_type as any, // TODO - Stop the any usage
-			tokenType: passwordResetToken.info.system_type as any, // TODO - Stop the any usage
+			tokenType: passwordResetToken.info.token_type as any, // TODO - Stop the any usage
 			pid: BigInt(pnid.pid),
 			accessLevel: pnid.access_level,
 			titleId: passwordResetToken.info.title_id,