diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 845c47f..9473b3a 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "TimeRecording",
-        "uri": "{/base}/humanresource/timerecording/dashboard?{?}",
+        "uri": "{/base}/humanresource/timerecording/dashboard",
         "target": "self",
         "icon": null,
         "order": 70,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Dashboard",
-                "uri": "{/base}/humanresource/timerecording/dashboard?{?}",
+                "uri": "{/base}/humanresource/timerecording/dashboard",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Stats",
-                "uri": "{/base}/humanresource/timerecording/stats?{?}",
+                "uri": "{/base}/humanresource/timerecording/stats",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -51,7 +51,7 @@
         "type": 2,
         "subtype": 1,
         "name": "TimeRecording",
-        "uri": "{/base}/private/timerecording/dashboard?{?}",
+        "uri": "{/base}/private/timerecording/dashboard",
         "target": "self",
         "icon": null,
         "order": 1,
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index a38edfb..032dd28 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -147,6 +147,8 @@ final class ApiController extends Controller
             return;
         }
 
+        $this->createModel($request->header->account, $element, SessionElementMapper::class, 'element', $request->getOrigin());
+
         if ($element->status === ClockingStatus::END) {
             /** @var \Modules\HumanResourceTimeRecording\Models\Session $session */
             $session = SessionMapper::get()
@@ -158,7 +160,6 @@ final class ApiController extends Controller
             SessionMapper::update()->execute($session);
         }
 
-        $this->createModel($request->header->account, $element, SessionElementMapper::class, 'element', $request->getOrigin());
         $this->createStandardCreateResponse($request, $response, $element);
     }
 
diff --git a/Models/Session.php b/Models/Session.php
index 212c168..3ea9d32 100755
--- a/Models/Session.php
+++ b/Models/Session.php
@@ -124,7 +124,7 @@ class Session implements \JsonSerializable
             }
         }
 
-        $this->start = $start;
+        $this->start = $start ?? $this->start;
         $this->end   = $end;
 
         $busyTime  = 0;