diff --git a/engine/server/sv_game.c b/engine/server/sv_game.c
index 8e9bd1ca..624f4da2 100644
--- a/engine/server/sv_game.c
+++ b/engine/server/sv_game.c
@@ -1166,8 +1166,7 @@ edict_t* pfnFindEntityByString( edict_t *pStartEdict, const char *pszField, cons
 		ed = EDICT_NUM( e );
 		if( !SV_IsValidEdict( ed )) continue;
 
-		// ignore clients that not in a game
-		if( e <= sv_maxclients->integer && !SV_ClientFromEdict( ed, true ))
+		if( e <= sv_maxclients->integer && !SV_ClientFromEdict( ed, ( sv_maxclients->integer != 1 )))
 			continue;
 
 		switch( desc->fieldType )
@@ -1334,7 +1333,7 @@ edict_t *pfnEntitiesInPVS( edict_t *pplayer )
 
 	VectorAdd( pplayer->v.origin, pplayer->v.view_ofs, viewpoint );
 
-	for( chain = EDICT_NUM( 0 ), i = svgame.globals->maxClients; i < svgame.numEntities; i++ )
+	for( chain = EDICT_NUM( 0 ), i = svgame.globals->maxClients + 1; i < svgame.numEntities; i++ )
 	{
 		pEdict = EDICT_NUM( i );