diff --git a/Sources/Actions/Calendar.php b/Sources/Actions/Calendar.php
index 2372fa8436..fb8c9be708 100644
--- a/Sources/Actions/Calendar.php
+++ b/Sources/Actions/Calendar.php
@@ -1802,6 +1802,12 @@ public static function convertDateToEnglish(string $date): string
 		$replacements += array_combine(array_map('strtolower', Lang::$txt['days_short']), [
 			'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat',
 		]);
+
+		// Fix for languages those do not use AM/PM
+		if (trim(Lang::$txt['time_am']) === '' && trim(Lang::$txt['time_pm']) === '') {
+			return strtr(strtolower($date), $replacements);
+		}
+
 		// Find all possible variants of AM and PM for this language.
 		$replacements[strtolower(Lang::$txt['time_am'])] = 'AM';
 		$replacements[strtolower(Lang::$txt['time_pm'])] = 'PM';
diff --git a/Themes/default/Calendar.template.php b/Themes/default/Calendar.template.php
index 326e0e7cb7..aefd22972d 100644
--- a/Themes/default/Calendar.template.php
+++ b/Themes/default/Calendar.template.php
@@ -849,12 +849,12 @@ function template_event_post()
 						<div class="event_options_left" id="event_time_input">
 							<div>
 								<span class="label">', Lang::$txt['start'], '</span>
-								<input type="text" name="start_date" id="start_date" value="', trim(Utils::$context['event']['start_date_orig']), '" tabindex="', Utils::$context['tabindex']++, '" class="date_input start" data-type="date">
+								<input type="text" name="start_date" id="start_date" value="', trim(Utils::$context['event']['start_date']), '" tabindex="', Utils::$context['tabindex']++, '" class="date_input start" data-type="date">
 								<input type="text" name="start_time" id="start_time" maxlength="11" value="', Utils::$context['event']['start_time_orig'], '" tabindex="', Utils::$context['tabindex']++, '" class="time_input start" data-type="time"', !empty(Utils::$context['event']['allday']) ? ' disabled' : '', '>
 							</div>
 							<div>
 								<span class="label">', Lang::$txt['end'], '</span>
-								<input type="text" name="end_date" id="end_date" value="', trim(Utils::$context['event']['end_date_orig']), '" tabindex="', Utils::$context['tabindex']++, '" class="date_input end" data-type="date"', Config::$modSettings['cal_maxspan'] == 1 ? ' disabled' : '', '>
+								<input type="text" name="end_date" id="end_date" value="', trim(Utils::$context['event']['end_date']), '" tabindex="', Utils::$context['tabindex']++, '" class="date_input end" data-type="date"', Config::$modSettings['cal_maxspan'] == 1 ? ' disabled' : '', '>
 								<input type="text" name="end_time" id="end_time" maxlength="11" value="', Utils::$context['event']['end_time_orig'], '" tabindex="', Utils::$context['tabindex']++, '" class="time_input end" data-type="time"', !empty(Utils::$context['event']['allday']) ? ' disabled' : '', '>
 							</div>
 						</div><!-- #event_time_input -->
diff --git a/Themes/default/Post.template.php b/Themes/default/Post.template.php
index 55f3df464a..7a37c2445c 100644
--- a/Themes/default/Post.template.php
+++ b/Themes/default/Post.template.php
@@ -159,12 +159,12 @@ function addPollOption()
 								<div class="event_options_left" id="event_time_input">
 									<div>
 										<span class="label">', Lang::$txt['start'], '</span>
-										<input type="text" name="start_date" id="start_date" value="', trim(Utils::$context['event']['start_date_orig']), '" tabindex="', Utils::$context['tabindex']++, '" class="date_input start" data-type="date">
+										<input type="text" name="start_date" id="start_date" value="', trim(Utils::$context['event']['start_date']), '" tabindex="', Utils::$context['tabindex']++, '" class="date_input start" data-type="date">
 										<input type="text" name="start_time" id="start_time" maxlength="11" value="', Utils::$context['event']['start_time_orig'], '" tabindex="', Utils::$context['tabindex']++, '" class="time_input start" data-type="time"', !empty(Utils::$context['event']['allday']) ? ' disabled' : '', '>
 									</div>
 									<div>
 										<span class="label">', Lang::$txt['end'], '</span>
-										<input type="text" name="end_date" id="end_date" value="', trim(Utils::$context['event']['end_date_orig']), '" tabindex="', Utils::$context['tabindex']++, '" class="date_input end" data-type="date"', Config::$modSettings['cal_maxspan'] == 1 ? ' disabled' : '', '>
+										<input type="text" name="end_date" id="end_date" value="', trim(Utils::$context['event']['end_date']), '" tabindex="', Utils::$context['tabindex']++, '" class="date_input end" data-type="date"', Config::$modSettings['cal_maxspan'] == 1 ? ' disabled' : '', '>
 										<input type="text" name="end_time" id="end_time" maxlength="11" value="', Utils::$context['event']['end_time_orig'], '" tabindex="', Utils::$context['tabindex']++, '" class="time_input end" data-type="time"', !empty(Utils::$context['event']['allday']) ? ' disabled' : '', '>
 									</div>
 								</div>