diff --git a/nq/source/host.c b/nq/source/host.c
index 907250a5c..601d5d335 100644
--- a/nq/source/host.c
+++ b/nq/source/host.c
@@ -386,8 +386,7 @@ SV_DropClient (qboolean crash)
 			// call the prog function for removing a client
 			// this will set the body to a dead frame, among other things
 			saveSelf = *sv_globals.self;
-			*sv_globals.self =
-				EDICT_TO_PROG (&sv_pr_state, host_client->edict);
+			*sv_globals.self = EDICT_TO_PROG (&sv_pr_state, host_client->edict);
 			PR_ExecuteProgram (&sv_pr_state, sv_funcs.ClientDisconnect);
 			*sv_globals.self = saveSelf;
 		}
diff --git a/nq/source/sv_main.c b/nq/source/sv_main.c
index f11f1389d..d1d795de8 100644
--- a/nq/source/sv_main.c
+++ b/nq/source/sv_main.c
@@ -1087,8 +1087,7 @@ SV_SaveSpawnparms (void)
 			continue;
 
 		// call the progs to get default spawn parms for the new client
-		*sv_globals.self =
-			EDICT_TO_PROG (&sv_pr_state, host_client->edict);
+		*sv_globals.self = EDICT_TO_PROG (&sv_pr_state, host_client->edict);
 		PR_ExecuteProgram (&sv_pr_state, sv_funcs.SetChangeParms);
 		for (j = 0; j < NUM_SPAWN_PARMS; j++)
 			host_client->spawn_parms[j] = sv_globals.parms[j];
diff --git a/qw/source/sv_pr_cpqw.c b/qw/source/sv_pr_cpqw.c
index eebb91ef4..f331b7e32 100644
--- a/qw/source/sv_pr_cpqw.c
+++ b/qw/source/sv_pr_cpqw.c
@@ -817,6 +817,7 @@ cpqw_user_cmd (void)
 		*sv_globals.self = EDICT_TO_PROG (&sv_pr_state, sv_player);
 
 		PR_PushFrame (pr);
+		PR_RESET_PARAMS (pr);
 		P_FLOAT (pr, 0) = argc;
 		for (i = 1; i < argc + 1; i++)
 			P_STRING (pr, i) = PR_SetTempString (pr, Cmd_Argv (i - 1));