diff --git a/esi_ui/static/dashboard/esi/lessee/offers/claim/claim-wizard.controller.js b/esi_ui/static/dashboard/esi/lessee/offers/claim/claim-wizard.controller.js
index 0fc2fd0..a340d40 100644
--- a/esi_ui/static/dashboard/esi/lessee/offers/claim/claim-wizard.controller.js
+++ b/esi_ui/static/dashboard/esi/lessee/offers/claim/claim-wizard.controller.js
@@ -5,45 +5,66 @@
     .module('horizon.dashboard.esi.lessee.offers.claim')
     .controller('ClaimWizardController', ClaimWizardController);
 
-  ClaimWizardController.$inject = [
-    '$scope',
-    'horizon.dashboard.esi.lessee.offers.claim.workflow',
-  ];
-
-  function ClaimWizardController($scope, claimWorkflow) {
-    $scope.workflow = claimWorkflow;
-    $scope.submit = submit;
-
-    function submit(stepModels) {
-      var start = null;
-      var end = null;
-
-      if (stepModels.start_date) {
-        start = new Date();
-        start.setUTCFullYear(stepModels.start_date.getUTCFullYear());
-        start.setUTCMonth(stepModels.start_date.getUTCMonth());
-        start.setUTCDate(stepModels.start_date.getUTCDate());
-        start.setUTCHours(stepModels.start_time.getHours());
-        start.setUTCMinutes(stepModels.start_time.getMinutes());
-        start.setUTCSeconds(0);
-        start.setUTCMilliseconds(0);
-      }
-      if (stepModels.end_date) {
-        end = new Date();
-        end.setUTCFullYear(stepModels.end_date.getUTCFullYear());
-        end.setUTCMonth(stepModels.end_date.getUTCMonth());
-        end.setUTCDate(stepModels.end_date.getUTCDate());
-        end.setUTCHours(stepModels.end_time.getHours());
-        end.setUTCMinutes(stepModels.end_time.getMinutes());
-        end.setUTCSeconds(0);
-        end.setUTCMilliseconds(0);
-      }
+    ClaimWizardController.$inject = [
+      '$scope',
+      'horizon.dashboard.esi.lessee.offers.claim.workflow',
+    ];
 
-      return Promise.resolve({
-        start_time: start,
-        end_time: end
-      });
-    }
-  }
+    function ClaimWizardController($scope, claimWorkflow) {
+      $scope.workflow = claimWorkflow;
+      $scope.submit = submit;
+
+      const now = new Date();
+      const defaultEnd = new Date(now);
+      defaultEnd.setDate(now.getDate() + 1);
+      defaultEnd.setUTCHours(now.getUTCHours());
+      defaultEnd.setUTCMinutes(now.getUTCMinutes());
+      defaultEnd.setUTCSeconds(0);
+      defaultEnd.setUTCMilliseconds(0);
+
+      $scope.defaultStart = {
+        date: new Date(now),
+        time: now.toISOString().substr(11, 5)
+      };
+
+      $scope.defaultEnd = {
+        date: new Date(defaultEnd),
+        time: defaultEnd.toISOString().substr(11, 5)
+      };
 
-})();
\ No newline at end of file
+      $scope.stepModels = {
+        start_date: $scope.defaultStart.date,
+        start_time: $scope.defaultStart.time,
+        end_date: $scope.defaultEnd.date,
+        end_time: $scope.defaultEnd.time
+      };
+
+      function submit(stepModels) {
+        let start = null;
+        let end = null;
+
+        if (stepModels.start_date && stepModels.start_time) {
+          start = new Date(stepModels.start_date);
+          const [startHour, startMinute] = stepModels.start_time.split(':');
+          start.setUTCHours(parseInt(startHour, 10));
+          start.setUTCMinutes(parseInt(startMinute, 10));
+          start.setUTCSeconds(0);
+          start.setUTCMilliseconds(0);
+        }
+
+        if (stepModels.end_date && stepModels.end_time) {
+          end = new Date(stepModels.end_date);
+          const [endHour, endMinute] = stepModels.end_time.split(':');
+          end.setUTCHours(parseInt(endHour, 10));
+          end.setUTCMinutes(parseInt(endMinute, 10));
+          end.setUTCSeconds(0);
+          end.setUTCMilliseconds(0);
+        }
+
+        return Promise.resolve({
+          start_time: start,
+          end_time: end
+        });
+      }
+    }
+  })();
diff --git a/esi_ui/static/dashboard/esi/lessee/offers/claim/claim.html b/esi_ui/static/dashboard/esi/lessee/offers/claim/claim.html
index f71d399..911de55 100644
--- a/esi_ui/static/dashboard/esi/lessee/offers/claim/claim.html
+++ b/esi_ui/static/dashboard/esi/lessee/offers/claim/claim.html
@@ -1,17 +1,17 @@
 <p class="step-description" translate>Please provide time a period to claim</p>
 
 <div class="form-group">
-  <label class="control-label" translate for="start">Start Time (UTC)</label>
+  <label class="control-label" for="start">Start Time (UTC)</label>
   <br>
-  <input type="date" id="start" ng-model="stepModels.start_date" />
-  <input type="time" id="start" ng-required="stepModels.start_date" ng-model="stepModels.start_time" />
-  <span translate>Default: now</span>
+  <input type="date" id="start-date" ng-model="stepModels.start_date" ng-value="defaultStart.date | date:'yyyy-MM-dd'" required />
+  <input type="time" id="start-time" ng-model="stepModels.start_time" ng-value="defaultStart.time" required />
+  <span>Default: now</span>
 </div>
 
 <div class="form-group">
-  <label class="control-label" translate for="end">End Time (UTC)</label>
+  <label class="control-label" for="end">End Time (UTC)</label>
   <br>
-  <input type="date" id="end" ng-model="stepModels.end_date" />
-  <input type="time" id="end" ng-required="stepModels.end_date" ng-model="stepModels.end_time" />
-  <span translate>Default: offer end time</span>
-</div>
\ No newline at end of file
+  <input type="date" id="end-date" ng-model="stepModels.end_date" ng-value="defaultEnd.date | date:'yyyy-MM-dd'" required />
+  <input type="time" id="end-time" ng-model="stepModels.end_time" ng-value="defaultEnd.time" required />
+  <span>Default: offer end time</span>
+</div>