diff --git a/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript b/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript
index 73a325dbe..3d817d4fb 100644
--- a/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript
+++ b/Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript
@@ -199,8 +199,13 @@ function GameConnectionListener::onSetSpawnPointComplete( %this, %client )
     %client.player = spawnObject(%client.spawnClass, %client.spawnDataBlock, "", %client.spawnProperties, %client.spawnScript);
     
     if(!isObject(%client.player))
+    {
        error("Failed to spawn player object!");
-    
+    }
+    else if (%client.player.isMemberOfClass("Camera"))
+    {
+        %client.camera = %client.player;
+    }
     if (!%client.player.isMemberOfClass(%client.spawnClass))
         warn("Trying to spawn a class that does not derive from "@ %client.spawnClass);