diff --git a/UI/WebServerResources/js/Common/utils.js b/UI/WebServerResources/js/Common/utils.js
index 72e27f5a4..ed6081bd4 100644
--- a/UI/WebServerResources/js/Common/utils.js
+++ b/UI/WebServerResources/js/Common/utils.js
@@ -283,7 +283,11 @@ Date.prototype.daysUpTo = function(otherDate) {
   var nbrDays = Math.round((day2 - day1) / DAY_SECS) + 1;
   for (var i = 0; i < nbrDays; i++) {
     var newDate = new Date();
-    newDate.setTime(day1 + (i * 86400000));
+    newDate.setTime(day1 + (i * DAY_SECS));
+    newDate.setHours(0);
+    newDate.setMinutes(0);
+    newDate.setSeconds(0);
+    newDate.setMilliseconds(0);
     days.push(newDate);
   }
 
diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js
index 3cf505ac0..90030d6ae 100644
--- a/UI/WebServerResources/js/Scheduler/ComponentController.js
+++ b/UI/WebServerResources/js/Scheduler/ComponentController.js
@@ -329,8 +329,8 @@
       if (!vm.attendeesEditor.containerElement) {
         vm.attendeesEditor.containerElement = $element[0].querySelector('#freebusy');
       }
-      if (vm.attendeesEditor.containerElement) {
-        dayElement = $element[0].querySelector('#freebusy_day_' + vm.component.start.getDayString());
+      dayElement = $element[0].querySelector('#freebusy_day_' + vm.component.start.getDayString());
+      if (vm.attendeesEditor.containerElement && dayElement) {
         scrollLeft = dayElement.offsetLeft - vm.attendeesEditor.containerElement.offsetLeft;
         vm.attendeesEditor.containerElement.scrollLeft = scrollLeft;
       }