diff --git a/csqc/main.qc b/csqc/main.qc
index b5c644cb..4cdb6ad6 100644
--- a/csqc/main.qc
+++ b/csqc/main.qc
@@ -851,8 +851,8 @@ float FoLogin(string token, float print_error) {
         return FALSE;
     }
 
-    localcmd("setinfo _fo_token ", token, "\n");
-    localcmd("cmd fo-login-silent\n");
+    localcmd("setinfo _fo_token \"\"\n");
+    localcmd(sprintf("cmd fo-login-silent %s\n", token));
     return TRUE;
 }
 
diff --git a/ssqc/commands.qc b/ssqc/commands.qc
index a261632b..1def02ea 100644
--- a/ssqc/commands.qc
+++ b/ssqc/commands.qc
@@ -957,13 +957,13 @@ float (string arg1, string arg2, string arg3) ParseCmds = {
             if (self.fo_login != string_null) {
                 sprint (self, PRINT_HIGH, "You are logged in\n");
             } else {
-                performFoLogin(self);
+                performFoLogin(self, arg2);
             }
             break;
         case "fo-login-silent":
             processedCmd = TRUE;
             if (self.fo_login == string_null)
-                performFoLogin(self);
+                performFoLogin(self, arg2);
             break;
         case "who":
             processedCmd = TRUE;
diff --git a/ssqc/login.qc b/ssqc/login.qc
index 2e2f472f..50c394aa 100644
--- a/ssqc/login.qc
+++ b/ssqc/login.qc
@@ -13,9 +13,8 @@ void (entity player, string login, string secret) performLogin = {
 	dprint("\n");
 }
 
-void (entity player) performFoLogin = {
+void (entity player, string token) performFoLogin = {
 	local string uri = sprintf("%s/results/api/v1/fo_login", backend_address);
-	local string token = FO_GetUserSettingString(player, "_fo_token", "fo_token", "");
 	uri_get(uri, FO_LOGIN_REQUEST, "application/json", sprintf("{ \"auth_token\": \"%s\" }", token));
 	dprint(sprintf("%s [%s] logging in\n", infokey(player, "name"), infokey(player, "ip")));
 }
diff --git a/ssqc/quadmode.qc b/ssqc/quadmode.qc
index 1e430e87..d222137a 100644
--- a/ssqc/quadmode.qc
+++ b/ssqc/quadmode.qc
@@ -56,7 +56,6 @@ void () PostFOQuadStarted = {
 	local float tn;
 	local float prefix_comma;
 	local entity p;
-	local string token;
 
 	for (tn = 1; tn <= number_of_teams; ++tn) {
 		data = strcat(data, "      \"", ftos(tn), "\": {\n");
@@ -70,9 +69,8 @@ void () PostFOQuadStarted = {
 				if (prefix_comma)
 					data = strcat(data, ",");
 
-				token = FO_GetUserSettingString(p, "_fo_token", "fo_token", "");
 				data = strcat(data, "          {\n");
-				data = strcat(data, "            \"auth_token\": \"", token, "\",\n");
+				data = strcat(data, "            \"id\": \"", p.fo_login, "\",\n");
 				data = strcat(data, "            \"playerclass\": \"", ftos(p.playerclass), "\"\n");
 				data = strcat(data, "          }\n");
 				prefix_comma = TRUE;
@@ -115,7 +113,6 @@ void () PostFOQuadFinalRoundStarted = {
 	local float tn;
 	local float prefix_comma;
 	local entity p;
-	local string token;
 
 	for (tn = 1; tn <= number_of_teams; ++tn) {
 		local float score = TeamFortress_TeamGetScore(tn);
@@ -132,9 +129,8 @@ void () PostFOQuadFinalRoundStarted = {
 				if (prefix_comma)
 					data = strcat(data, ",");
 
-				token = FO_GetUserSettingString(p, "_fo_token", "fo_token", "");
 				data = strcat(data, "          {\n");
-				data = strcat(data, "            \"auth_token\": \"", token, "\",\n");
+				data = strcat(data, "            \"id\": \"", p.fo_login, "\",\n");
 				data = strcat(data, "            \"playerclass\": \"", ftos(p.playerclass), "\"\n");
 				data = strcat(data, "          }\n");
 				prefix_comma = TRUE;
@@ -187,7 +183,6 @@ void (float winner) PostFOQuadFinished = {
 	local float tn;
 	local float prefix_comma;
 	local entity p;
-	local string token;
 
 	for (tn = 1; tn <= number_of_teams; ++tn) {
 		local float score = TeamFortress_TeamGetScore(tn);