diff --git a/addons/markers/functions/fnc_onButtonClickConfirm.sqf b/addons/markers/functions/fnc_onButtonClickConfirm.sqf
index 12c6f37d06..f70c43f2e1 100644
--- a/addons/markers/functions/fnc_onButtonClickConfirm.sqf
+++ b/addons/markers/functions/fnc_onButtonClickConfirm.sqf
@@ -42,6 +42,11 @@ if (cbChecked _aceTimestamp && {ACE_player call FUNC(canTimestamp)}) then {
             _time = _time - 12;
             _periodPostfix = " pm";
         };
+    } else {
+        if (GVAR(timestampHourFormat) == 0) then {
+            systemTime params ["", "", "", "_hour", "_min", "_sec"];
+            _time = _hour + _min/60 + _sec/3600;
+        };
     };
 
     _description ctrlSetText format [
diff --git a/addons/markers/initSettings.sqf b/addons/markers/initSettings.sqf
index ce8e8e0473..0e7ec2bcb0 100644
--- a/addons/markers/initSettings.sqf
+++ b/addons/markers/initSettings.sqf
@@ -37,8 +37,8 @@ private _categoryName = format ["ACE %1", localize ELSTRING(map,Module_DisplayNa
     [LSTRING(TimestampHourFormat), LSTRING(TimestampHourFormatDescription)],
     [_categoryName, LLSTRING(Module_DisplayName)],
     [
-        [24, 12],
-        [LSTRING(TimestampHourFormat24), LSTRING(TimestampHourFormat12)],
+        [24, 12, 0],
+        [LSTRING(TimestampHourFormat24), LSTRING(TimestampHourFormat12), "System"],
         0
     ]
 ] call CBA_fnc_addSetting;