diff --git a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
index b068a86..325b605 100644
--- a/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
+++ b/DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
@@ -130,7 +130,7 @@ namespace SQLiteRepository
             var now = DateTime.UtcNow;
             var calendarWeek = GetIso8601CalendarWeek(now);
             ret.CalendarWeek = calendarWeek;
-
+            ret.SelectedDate = now;
             ret.TimeLogs = GetTimeLogList(userId, calendarWeek, now.Year);
 
             return ret;
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
index 3e3930a..1f3a31d 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
@@ -141,7 +141,7 @@
     self.dismissAlert = function(data, event) {
         self.errorData(null);
     };
-    self.initDatePicker = function () {
+    self.initDatePicker = function (selectedDate) {
         $("#weeklyDatePicker").datepicker({
             weekStart: 1,
             maxViewMode: 2,
@@ -151,7 +151,12 @@
             todayHighlight: true,
             calendarWeeks: true
         });
-        $("#weeklyDatePicker").datepicker("setDate", new Date().toDateString("yyyy-mm-dd"));
+        if (!selectedDate) {
+            selectedDate = new Date().toDateString("yyyy-mm-dd");
+        } else {
+            selectedDate = new Date(selectedDate).toDateString("yyyy-mm-dd");
+        }
+        $("#weeklyDatePicker").datepicker("setDate", selectedDate);
         console.log("finished init");
     };
     self.assignHandler = function () {
@@ -229,7 +234,7 @@
             false);
         $.getJSON(url, function (res) {
             self.userTimeLogData(res);
-            self.initDatePicker();
+            self.initDatePicker(res.SelectedDate);
             self.assignHandler();
         }).fail(function (resp, status, error) {
             console.log("error - getuserdetails");