diff --git a/SQF/dayz_code/groups/init.sqf b/SQF/dayz_code/groups/init.sqf
index c22205baa..8ea88a0c4 100644
--- a/SQF/dayz_code/groups/init.sqf
+++ b/SQF/dayz_code/groups/init.sqf
@@ -16,7 +16,7 @@ if (count dayz_myGroup > 1 && {!dayz_requireRadio or {dayz_requireRadio && "Item
 			systemChat format [localize "STR_EPOCH_REJOINED_GROUP",name _leader];
 			
 			// Update saved group in DB
-			PVDZ_Server_UpdateGroup = [0,player];
+			PVDZ_Server_UpdateGroup = [1,player];
 			publicVariableServer "PVDZ_Server_UpdateGroup";
 		};
 	} count allGroups;
diff --git a/SQF/dayz_code/groups/server_updateGroup.sqf b/SQF/dayz_code/groups/server_updateGroup.sqf
index ed4022791..d670f10ec 100644
--- a/SQF/dayz_code/groups/server_updateGroup.sqf
+++ b/SQF/dayz_code/groups/server_updateGroup.sqf
@@ -1,8 +1,7 @@
-private ["_event","_groupUIDs","_key","_newGroup","_player","_playerUID","_targetUID"];
+private ["_event","_groupUIDs","_newGroup","_player","_playerUID"];
 
 _event = _this select 0;
 _player = _this select 1;
-_targetUID = if (count _this > 2) then {_this select 2} else {"0"};
 _playerUID = getPlayerUID _player;
 
 if (_event < 3) then {
@@ -25,12 +24,13 @@ _groupUIDs = [];
 
 _newGroup = [];
 _newGroup = switch _event do {
-	//Login
-	case 0;
 	//Join
-	case 1;
+	case 1: {_groupUIDs};
 	//Kick (target was already kicked from group)
-	case 2: {_groupUIDs};
+	case 2: {
+		format["CHILD:204:%1:%2:%3:",(_this select 2),dayZ_instance,[]] call server_hiveWrite;
+		_groupUIDs
+	};
 	//Leave
 	case 3: {
 		dayz_groupLeft = true;
@@ -47,7 +47,6 @@ _newGroup = switch _event do {
 
 // Update all group members' saved group in DB
 {
-	_save = if ((_event == 2 && _x == _targetUID) or (_event == 3 && _x == _playerUID)) then {[]} else {_newGroup};
-	_key = format ["CHILD:204:%1:%2:%3:",_x,dayZ_instance,_save];
-	_key call server_hiveWrite;
+	_save = if (_event == 3 && _x == _playerUID) then {[]} else {_newGroup};
+	format["CHILD:204:%1:%2:%3:",_x,dayZ_instance,_save] call server_hiveWrite;
 } count _groupUIDs;
\ No newline at end of file