diff --git a/SQF/dayz_server/compile/server_handleSafeGear.sqf b/SQF/dayz_server/compile/server_handleSafeGear.sqf
index b5738fc5e..2fd2f7786 100644
--- a/SQF/dayz_server/compile/server_handleSafeGear.sqf
+++ b/SQF/dayz_server/compile/server_handleSafeGear.sqf
@@ -3,7 +3,7 @@ private ["_backpacks","_charID","_clientID","_dir","_holder","_lockCode","_lockC
 _player = _this select 0;
 _obj = _this select 1;
 _status = _this select 2;
-if (count _this > 3) then {_suppliedCode = _this select 3;};
+
 _name = if (alive _player) then {name _player} else {"Dead Player"};
 
 _type = typeOf _obj;
@@ -16,6 +16,11 @@ _objectUID = _obj getVariable ["ObjectUID","0"];
 _ownerID = _obj getVariable ["ownerPUID","0"];
 _lockCode = _charID;
 
+if (count _this > 3) then {
+	_suppliedCode = _this select 3;
+	_lockCode = _suppliedCode;
+};
+
 // Player may have disconnected or died before message send. Attempt lock/unlock/pack/save procedure anyway
 if (isNull _player) then {diag_log "ERROR: server_handleSafeGear called with Null player object";};