diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
index c1e3d736b..67fdecf31 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_appear.xml
@@ -353,12 +353,12 @@
 <proc id="proc_finish3">
 	<action handler="proc" params="appear_disable_buttons" />
 	<action handler="set" params="dblink=UI:TEMP:FROM|value=1" />
-	<!--
 	<action handler="set" params="dblink=UI:NEXT_SCREEN|value=%screen_location" />
 	<action handler="copy" params="dbdst=UI:CURRENT_SCREEN|dbsrc=UI:NEXT_SCREEN" />
-	-->
+	<!--
 	<action handler="set" params="dblink=UI:TEMP:CHAR3D:DEST|value=1" />
 	<action handler="ask_create_char" params="name=ui:outgame:appear_name:eb|caracs=UI:TEMP:JOB_|charsum=UI:TEMP:CHAR3D|loc=UI:TEMP:CHAR3D:DEST|slot=@UI:TEMP:CHARSELSLOT" />
+	-->
 </proc>
 
 
diff --git a/code/ryzom/server/src/entities_game_service/egs_variables.cpp b/code/ryzom/server/src/entities_game_service/egs_variables.cpp
index 1891025c9..4c39f303e 100644
--- a/code/ryzom/server/src/entities_game_service/egs_variables.cpp
+++ b/code/ryzom/server/src/entities_game_service/egs_variables.cpp
@@ -568,7 +568,9 @@ CVariable<NLMISC::TGameCycle> OutpostLeavePeriod("egs","OutpostLeavePeriod", "ti
 
 CVariable<bool>	VerboseFactionPoint("egs", "VerboseFactionPoint", "set if faction point system is verbose or not", false, 0, true);
 
+#ifdef RYZOM_FORGE
 CVariable<bool> UseNewNewbieLandStartingPoint("egs", "UseNewNewbieLandStartingPoint", "set if create new character start at new noobland or old", false, 0, true);
+#endif
 
 // Fame
 // - Limits
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp
index 069933e2b..1ccd594eb 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.cpp
@@ -1577,12 +1577,15 @@ void CEntityBase::serial(NLMISC::IStream &f)
 		{
 			// select starting point
 			RYZOM_STARTING_POINT::TStartPoint sp;
+
+#ifdef RYZOM_FORGE
 //			if(UseNewNewbieLandStartingPoint)
-			{
+//			{
 				sp= RYZOM_STARTING_POINT::starting_city;
-			}
-/*			else
-			{
+//			}
+//			else
+#else
+//			{
 				switch( _Race )
 				{
 					case EGSPD::CPeople::Fyros:
@@ -1600,8 +1603,9 @@ void CEntityBase::serial(NLMISC::IStream &f)
 					default:
 						sp = RYZOM_STARTING_POINT::aegus;
 				}
-			}
-*/
+//			}
+#endif
+
 			// set the character initial state
 			TAIAlias bot,mission;
 			const CTpSpawnZone * zone = CZoneManager::getInstance().getStartPoint( (uint16)sp,bot,mission );
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
index 762db5af1..a8e551cac 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
@@ -965,10 +965,12 @@ void cbCreateChar( CMessage& msgin, const std::string &serviceName, NLNET::TServ
 	createCharMsg.serial( msgin );
 
 	// Yoyo: fix to force new newbieland.
+#ifdef RYZOM_FORGE
 	if(UseNewNewbieLandStartingPoint)
 	{
 		createCharMsg.StartPoint= RYZOM_STARTING_POINT::starting_city;
 	}
+#endif
 
 	// acceptable name if: first char is an upper case, all the name is lower case
 	for (uint i = 0; i < createCharMsg.Name.size(); i++)
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
index c76d43a26..713878647 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
@@ -8381,6 +8381,7 @@ void CCharacter::setStartStatistics( const CCreateCharMsg& createCharMsg )
 	RYZOM_STARTING_POINT::TStartPoint sp = createCharMsg.StartPoint;
 	if( sp < RYZOM_STARTING_POINT::stalli || sp >= RYZOM_STARTING_POINT::NB_START_POINTS )
 	{
+		// FIXME: There's no safety on player race for starting zone. -Kaetemi
 		if(UseNewNewbieLandStartingPoint)
 			sp = RYZOM_STARTING_POINT::starting_city;
 		else
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/player.cpp b/code/ryzom/server/src/entities_game_service/player_manager/player.cpp
index 628a26e9f..c0600997c 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/player.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/player.cpp
@@ -490,11 +490,13 @@ CEntityId CPlayer::createCharacter( const std::string& characterName, EGSPD::CPe
 	msg.Name = characterName;
 	msg.People = people;
 	msg.Sex = gender;
+#ifdef RYZOM_FORGE
 	if(UseNewNewbieLandStartingPoint)
 	{
 		msg.StartPoint = RYZOM_STARTING_POINT::starting_city;
 	}
 	else
+#endif
 	{
 		msg.StartPoint = RYZOM_STARTING_POINT::aegus;
 	}