diff --git a/src/d_player.h b/src/d_player.h
index 75ed533d9..69487070e 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -325,6 +325,10 @@ struct userinfo_t : TMap<FName,FBaseCVar *>
 	{
 		return *static_cast<FIntCVar *>(*CheckKey(NAME_Gender));
 	}
+	bool GetNoAutostartMap() const
+	{
+		return *static_cast<FBoolCVar *>(*CheckKey(NAME_Wi_NoAutostartMap));
+	}
 
 	void Reset();
 	int TeamChanged(int team);
diff --git a/src/namedef.h b/src/namedef.h
index f7607400e..644d0deb4 100644
--- a/src/namedef.h
+++ b/src/namedef.h
@@ -568,3 +568,4 @@ xx(NeverSwitchOnPickup)
 xx(MoveBob)
 xx(StillBob)
 xx(PlayerClass)
+xx(Wi_NoAutostartMap)
\ No newline at end of file
diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp
index 6ae9148af..7aef939b1 100644
--- a/src/wi_stuff.cpp
+++ b/src/wi_stuff.cpp
@@ -62,7 +62,7 @@ typedef enum
 
 CVAR (Bool, wi_percents, true, CVAR_ARCHIVE)
 CVAR (Bool, wi_showtotaltime, true, CVAR_ARCHIVE)
-CVAR (Bool, wi_noautostartmap, false, CVAR_ARCHIVE)
+CVAR (Bool, wi_noautostartmap, false, CVAR_USERINFO|CVAR_ARCHIVE)
 
 
 void WI_loadData ();
@@ -1098,11 +1098,28 @@ void WI_updateNoState ()
 {
 	WI_updateAnimatedBack();
 
+	if (acceleratestage)
+	{
+		cnt = 0;
+	}
+	else
+	{
+		bool noauto = noautostartmap;
 
-	if (!wi_noautostartmap && !noautostartmap) cnt--;
-	if (acceleratestage) cnt=0;
+		for (int i = 0; !noauto && i < MAXPLAYERS; ++i)
+		{
+			if (playeringame[i])
+			{
+				noauto |= players[i].userinfo.GetNoAutostartMap();
+			}
+		}
+		if (!noauto)
+		{
+			cnt--;
+		}
+	}
 
-	if (cnt==0)
+	if (cnt == 0)
 	{
 		WI_End();
 		G_WorldDone();