diff --git a/SQF/dayz_code/compile/player_unlockDoor.sqf b/SQF/dayz_code/compile/player_unlockDoor.sqf
index bd509db34..18b5813b2 100644
--- a/SQF/dayz_code/compile/player_unlockDoor.sqf
+++ b/SQF/dayz_code/compile/player_unlockDoor.sqf
@@ -9,8 +9,6 @@ if(!isNil "DZE_DYN_UnlockDoorInprogress") exitWith { cutText [(localize "str_epo
 
 DZE_DYN_UnlockDoorInprogress = true;
 
-[10,5] call dayz_HungerThirst;
-
 if(!isNull dayz_selectedDoor) then {
 
 	if (!isNil 'KeyCodeTryTimer') then {
@@ -37,7 +35,7 @@ if(!isNull dayz_selectedDoor) then {
 
 		// Check combination
 		if (DZE_Lock_Door == _objectCharacterID) then {
-	
+
 			[player,"combo_unlock",0,false] call dayz_zombieSpeak;
 
 			// close display
@@ -55,6 +53,9 @@ if(!isNull dayz_selectedDoor) then {
 			KeyCodeTry = nil;
 
 		} else {
+
+			[10,10] call dayz_HungerThirst;
+
 			DZE_Lock_Door = "";
 			[player,"combo_locked",0,false] call dayz_zombieSpeak;
 			[player,20,true,(getPosATL player)] spawn player_alertZombies;
diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf
index 8ace92c8f..3948b112e 100644
--- a/SQF/dayz_code/compile/player_unlockVault.sqf
+++ b/SQF/dayz_code/compile/player_unlockVault.sqf
@@ -8,8 +8,6 @@ private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_holder","_we
 if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_21") , "PLAIN DOWN"]; };
 TradeInprogress = true;
 
-[5,10] call dayz_HungerThirst;
-
 {player removeAction _x} forEach s_player_combi;s_player_combi = [];
 s_player_unlockvault = 1;
 
@@ -56,7 +54,7 @@ if ((_ownerID == dayz_combination) or (_ownerID == dayz_playerUID)) then {
 		if(!isNull _obj and alive _obj) then {
 
 			_obj setVariable["packing",1];
-
+			[1,1] call dayz_HungerThirst;
 			player playActionNow "Medic";
 			sleep 1;
 			[player,"tentpack",0,false] call dayz_zombieSpeak;
@@ -118,6 +116,7 @@ if ((_ownerID == dayz_combination) or (_ownerID == dayz_playerUID)) then {
 		cutText [format[(localize "str_player_beinglooted"),_text] , "PLAIN DOWN"];
 	};
 } else {
+	[10,10] call dayz_HungerThirst;
 	player playActionNow "Medic";
 	sleep 1;
 	[player,"repair",0,false] call dayz_zombieSpeak;