diff --git a/typo3/sysext/belog/Classes/Controller/AbstractController.php b/typo3/sysext/belog/Classes/Controller/AbstractController.php
index 12ce846ad07870c178c1a5e21913136e9f833bc5..effdec118419e887c7e3e8ae177f7489158e4bf2 100644
--- a/typo3/sysext/belog/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/belog/Classes/Controller/AbstractController.php
@@ -357,12 +357,33 @@ abstract class AbstractController extends ActionController
                 $startTime = mktime(0, 0, 0) - 31 * 3600 * 24;
                 break;
             case self::TIMEFRAME_CUSTOM:
-                $startTime = $constraint->getStartTimestamp();
-                if ($constraint->getEndTimestamp() > $constraint->getStartTimestamp()) {
-                    $endTime = $constraint->getEndTimestamp();
-                } else {
-                    $endTime = $GLOBALS['EXEC_TIME'];
+                $startDate = $constraint->getManualDateStart();
+                $endDate = $constraint->getManualDateStop();
+                $endTime = $GLOBALS['EXEC_TIME'];
+                if (!$startDate) {
+                    $startDate = \DateTime::createFromFormat(
+                        'U',
+                        0
+                    );
+                    $constraint->setManualDateStart(
+                        $startDate
+                    );
                 }
+
+                if (!$endDate) {
+                    $endDate = \DateTime::createFromFormat(
+                        'U',
+                        $endTime
+                    )->setTimezone(new \DateTimeZone(date_default_timezone_get()));
+                    $constraint->setManualDateStop(
+                        $endDate
+                    );
+                }
+                $startTime = $startDate->getTimestamp();
+                if ($endDate->getTimestamp() > $startDate->getTimestamp()) {
+                    $endTime = $endDate->getTimestamp();
+                }
+
                 break;
             default:
         }
diff --git a/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html b/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html
index 9e2de80d54f295df4c6f03f6c1933c11bbf8c2fc..9a0b5467cf43daae81aed4346027115a020c02bb 100644
--- a/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html
+++ b/typo3/sysext/belog/Resources/Private/Partials/Content/Filter.html
@@ -108,12 +108,15 @@
 			<div class="input-group input-group-sm">
 				<f:form.textfield
 						name="manualDateStart"
-						value="{f:if(condition: constraint.startTimestamp, then: \"{f:format.date(format:'{settings.timeFormat} {settings.dateFormat}', date: '@{constraint.startTimestamp}')}\")}"
+						value="{f:if(condition: constraint.manualDateStart, then: \"{f:format.date(format:'{settings.timeFormat} {settings.dateFormat}', date: '{constraint.manualDateStart}')}\")}"
 						id="manualDateStart"
 						class="form-control input-sm t3js-datetimepicker t3js-clearable"
 						data="{date-type: 'datetime'}"
 						/>
-				<f:form.hidden property="startTimestamp" value="{constraint.startTimestamp}" />
+				<f:form.hidden
+						property="manualDateStart"
+						value="{f:if(condition: constraint.manualDateStart, then: \"{f:format.date(format:'c', date: '{constraint.manualDateStart}')}\")}"
+				/>
 				<span class="input-group-btn">
 					<label class="btn btn-default" for="manualDateStart">
 						<span class="fa fa-calendar"></span>
@@ -128,12 +131,14 @@
 			<div class="input-group input-group-sm">
 				<f:form.textfield
 						name="manualDateStop"
-						value="{f:format.date(format:'{settings.timeFormat} {settings.dateFormat}', date: '@{constraint.endTimestamp}')}"
+						value="{f:format.date(format:'{settings.timeFormat} {settings.dateFormat}', date: '{constraint.manualDateStop}')}"
 						id="manualDateStop"
 						class="form-control input-sm t3js-datetimepicker t3js-clearable"
 						data="{date-type: 'datetime'}"
 						/>
-				<f:form.hidden property="endTimestamp" />
+				<f:form.hidden property="manualDateStop"
+						value="{f:format.date(format:'c', date: '{constraint.manualDateStop}')}"
+				/>
 				<span class="input-group-btn">
 					<label class="btn btn-default" for="manualDateStop">
 						<span class="fa fa-calendar"></span>
diff --git a/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html b/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html
index 33b3a0f87219aff016bed47ffbd877c9535a1e2a..5c832fc3bea652bebe32638ad56ad93f043203bb 100644
--- a/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html
+++ b/typo3/sysext/belog/Resources/Private/Partials/Content/LogEntries.html
@@ -9,8 +9,8 @@
 		<f:translate
 			key="timeInfo"
 			arguments="{
-				0: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
-				1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+				0: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStart}\')}',
+				1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStop}\')}'
 			}"
 		/>
 		<p>
@@ -42,8 +42,8 @@
 									key="logForNonPageRelatedActionsOrRootLevelOrPage"
 									arguments="{
 										0: '{f:translate(key:\'forNonPageRelatedActions\')}',
-										1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
-										2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+										1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStart}\')}',
+										2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStop}\')}'
 									}"
 								/>
 							</f:if>
@@ -52,8 +52,8 @@
 									key="logForNonPageRelatedActionsOrRootLevelOrPage"
 									arguments="{
 										0: '{f:translate(key:\'forRootLevel\')}',
-										1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
-										2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+										1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStart}\')}',
+										2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStop}\')}'
 									}"
 								/>
 							</f:if>
@@ -76,8 +76,8 @@
 											1:\\\'{pid}\\\'
 										}\'
 									)}',
-									1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
-									2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+									1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStart}\')}',
+									2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStop}\')}'
 								}"
 								/>
 							</f:format.raw>
@@ -89,8 +89,8 @@
 						key="logForNonPageRelatedActionsOrRootLevelOrPage"
 						arguments="{
 							0: '',
-							1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.startTimestamp}\')}',
-							2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'@{constraint.endTimestamp}\')}'
+							1: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStart}\')}',
+							2: '{f:format.date(format:\'{settings.dateFormat} {settings.timeFormat}\', date:\'{constraint.manualDateStop}\')}'
 						}"
 					/>
 				</f:else>