diff --git a/src/m_menu.c b/src/m_menu.c
index a2af1158e..dc888cb2d 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -7473,8 +7473,8 @@ static void M_ServerOptions(INT32 choice)
 		OP_ServerOptionsMenu[ 2].status = IT_GRAYEDOUT; // Max players
 		OP_ServerOptionsMenu[ 3].status = IT_GRAYEDOUT; // Allow WAD downloading
 		OP_ServerOptionsMenu[ 4].status = IT_GRAYEDOUT; // Allow players to join
-		OP_ServerOptionsMenu[30].status = IT_GRAYEDOUT; // Master server
-		OP_ServerOptionsMenu[31].status = IT_GRAYEDOUT; // Attempts to resynchronise
+		OP_ServerOptionsMenu[33].status = IT_GRAYEDOUT; // Master server
+		OP_ServerOptionsMenu[34].status = IT_GRAYEDOUT; // Attempts to resynchronise
 	}
 	else
 	{
@@ -7483,10 +7483,10 @@ static void M_ServerOptions(INT32 choice)
 		OP_ServerOptionsMenu[ 3].status = IT_STRING | IT_CVAR;
 		OP_ServerOptionsMenu[ 4].status = IT_STRING | IT_CVAR;
 		if (netgame)
-			OP_ServerOptionsMenu[30].status = IT_GRAYEDOUT;
+			OP_ServerOptionsMenu[33].status = IT_GRAYEDOUT;
 		else
-			OP_ServerOptionsMenu[30].status = IT_STRING | IT_CVAR | IT_CV_STRING;
-		OP_ServerOptionsMenu[31].status = IT_STRING | IT_CVAR;
+			OP_ServerOptionsMenu[33].status = IT_STRING | IT_CVAR | IT_CV_STRING;
+		OP_ServerOptionsMenu[34].status = IT_STRING | IT_CVAR;
 	}
 #endif
 
diff --git a/src/p_inter.c b/src/p_inter.c
index 73dd9906b..93a33e984 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1309,7 +1309,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 						players[i].starpostangle = special->angle;
 						players[i].starpostnum = special->health;
 
-						if (cv_respawntype.value == 1 && && players[i].lives > 0 && players[i].playerstate == PST_DEAD)
+						if (cv_respawntype.value == 1 && players[i].lives > 0 && players[i].playerstate == PST_DEAD)
 							players[i].playerstate = PST_REBORN;
 					}
 				}