diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
index d1bf022c..9b661171 100644
--- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
+++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
@@ -177,9 +177,7 @@ if (!isNull _player) then {
 			_group = createGroup [west, true];
 		};
 
-		_player setPosATL _location;
-
-		_newPlyr = _group createUnit[_class, _location, [], 0, "CAN_COLLIDE"];
+		_newPlyr = _group createUnit[_class, getMarkerPos "respawn_west", [], 0, "CAN_COLLIDE"];
 		if !(isNull _newPlyr) then {
 
 			// disable AI on temp unit
@@ -199,9 +197,6 @@ if (!isNull _player) then {
 			// disable further damage server side
 			_newPlyr allowDamage false;
 
-			_newPlyr setDir _dir;
-			_newPlyr setPosATL _location;
-
 			// set player loadout
 			if (_schemaVersion >= 1.0) then {
 				_playerData params ["","","_appearance","","","_loadout"];
@@ -361,6 +356,9 @@ if (!isNull _player) then {
 				_newPlyr setVariable["SETUP", true, true];
 
 				// Send message to player so they can take over the new body.
+				_player setPosATL _location;
+				_newPlyr setDir _dir;
+				_newPlyr setPosATL _location;
 				[_playerNetID, _playerUID, [_newPlyr, _vars, _currentWeapon, loadAbs _newPlyr, _playerGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken,_playerGroupArray, _communityStats, _hitpoints], _fsmHandle, _player] call EPOCH_server_pushPlayer;
 				// diag_log str([_playerNetID, _playerUID, _player, [_newPlyr, (_player isEqualTo _newPlyr), _vars, _currentWeapon, loadAbs _newPlyr, _playerGroup, _canBeRevived, [],_playerGroupArray, _communityStats, _hitpoints], _fsmHandle]);