diff --git a/SQF/dayz_code/groups/init.sqf b/SQF/dayz_code/groups/init.sqf
index eff6e8025..4b015d17a 100644
--- a/SQF/dayz_code/groups/init.sqf
+++ b/SQF/dayz_code/groups/init.sqf
@@ -3,6 +3,7 @@ private ["_leader","_oldGroup","_savedGroup"];
 uiSleep 1;
 if (count (units group player) > 1) then {
 	[player] joinSilent grpNull;
+	diag_log "Clearing group";
 };
 
 _savedGroup = (PVCDZ_plr_Login select 10) - [getPlayerUID player];
@@ -42,7 +43,7 @@ dayz_promotePlayer = compile preprocessFileLineNumbers "\z\addons\dayz_code\grou
 dayz_rejectGroup = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\reject.sqf";
 dayz_groupInit = true;
 
-if (count (units group player) > 1) then {
+if (!isNil "PVDZ_Server_UpdateGroup") then {
 	dayz_groupTags = execVM "\z\addons\dayz_code\groups\groupTags.sqf";
 };
 
diff --git a/SQF/dayz_code/groups/invite.sqf b/SQF/dayz_code/groups/invite.sqf
index 04e943a55..3f8b9f88c 100644
--- a/SQF/dayz_code/groups/invite.sqf
+++ b/SQF/dayz_code/groups/invite.sqf
@@ -27,4 +27,8 @@ dayz_activeInvites set [count dayz_activeInvites,_invite];
 PVDZ_groupInvite = [true,_invite];
 publicVariableServer "PVDZ_groupInvite";
 
-systemChat format[localize "STR_EPOCH_INVITE_TO",name _recipient];
\ No newline at end of file
+systemChat format[localize "STR_EPOCH_INVITE_TO",name _recipient];
+
+if (isNil "dayz_groupTags" or {scriptDone "dayz_groupTags"}) then {
+	dayz_groupTags = execVM "\z\addons\dayz_code\groups\groupTags.sqf";
+};
\ No newline at end of file