diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf
index e21cd35d1..18e09c5a9 100644
--- a/SQF/dayz_code/init/variables.sqf
+++ b/SQF/dayz_code/init/variables.sqf
@@ -624,6 +624,11 @@ if(!isDedicated) then {
 	if(isNil "DZE_ForceNameTagsOff") then {
 		DZE_ForceNameTagsOff = false;
 	};
+	if(isNil "DZE_FriendlySaving") then {
+		DZE_FriendlySaving = true;
+	};
+	
+	DZE_Friends = [];
 
 	DZE_CanPickup = true;
 	DZE_Q = false;
diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm
index fa3f61240..4477bc491 100644
--- a/SQF/dayz_code/system/player_monitor.fsm
+++ b/SQF/dayz_code/system/player_monitor.fsm
@@ -1085,7 +1085,10 @@ class FSM
        "	//Reload players state" \n
        "	if (count _state > 2) then {" \n
        "		dayz_temperatur = _state select 2;" \n
-       "	};" \n
+       "	}; " \n
+	   "	if ((count _state > 3) and DZE_FriendlySaving) then {" \n
+       "		DZE_Friends = _state select 3;" \n
+       "	}; " \n
        "} else {" \n
        "	_currentWpn	=	""Makarov"";" \n
        "	_currentAnim	=	""aidlpercmstpsraswpstdnon_player_idlesteady02"";" \n
diff --git a/SQF/dayz_code/system/player_spawn_2.sqf b/SQF/dayz_code/system/player_spawn_2.sqf
index 37d7cd352..463fb4e64 100644
--- a/SQF/dayz_code/system/player_spawn_2.sqf
+++ b/SQF/dayz_code/system/player_spawn_2.sqf
@@ -15,6 +15,7 @@ _maxDistancePlayer = DZE_teleport select 3;
 _maxDistanceVehicle = DZE_teleport select 4;
 
 player setVariable ["temperature",dayz_temperatur,true];
+player setVariable ["friendlyTo",DZE_Friends,true];
 
 dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)) +  (((count dayz_myMagazines) * 0.1) + (count dayz_myWeapons * 0.5));
 
diff --git a/SQF/dayz_server/compile/server_playerSync.sqf b/SQF/dayz_server/compile/server_playerSync.sqf
index 50ff7dc57..81e1e90a9 100644
--- a/SQF/dayz_server/compile/server_playerSync.sqf
+++ b/SQF/dayz_server/compile/server_playerSync.sqf
@@ -165,6 +165,9 @@ if (_characterID != "0") then {
 		};
 		_temp = round(_character getVariable ["temperature",100]);
 		_currentState = [_currentWpn,_currentAnim,_temp];
+		if(DZE_FriendlySaving) then {
+			_currentState set [(count _currentState),(_character getVariable ["friendlyTo",[]])];
+		};
 		/*
 			Everything is ready, now publish to HIVE
 		*/