diff --git a/core/Plugin/Menu.php b/core/Plugin/Menu.php
index 0ed31e452d9c4c3d1cd6f7e13a6d79348c40566d..d2c54645f1c3e4afbbf389681877c9afbb17a10d 100644
--- a/core/Plugin/Menu.php
+++ b/core/Plugin/Menu.php
@@ -195,7 +195,7 @@ class Menu
             $defaultDate = $userPreferences->getDefaultDate();
         }
         if (empty($defaultPeriod)) {
-            $defaultPeriod = $userPreferences->getDefaultPeriod($defaultDate);
+            $defaultPeriod = $userPreferences->getDefaultPeriod(false);
         }
         return array(
             'idSite' => $websiteId,
diff --git a/plugins/UsersManager/UserPreferences.php b/plugins/UsersManager/UserPreferences.php
index 53675833f3c0b14e2e548175b504ce3f5d92d735..86b61b97fe22953f1f36f24b81082f572768d5ce 100644
--- a/plugins/UsersManager/UserPreferences.php
+++ b/plugins/UsersManager/UserPreferences.php
@@ -98,9 +98,12 @@ class UserPreferences
      */
     public function getDefaultPeriod($defaultDate)
     {
-        $defaultPeriod = Config::getInstance()->General['default_period'];
-        if ($defaultDate === false) {
-            return $defaultPeriod;
+        if (empty($defaultDate)) {
+            $defaultDate = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE);
+        }
+
+        if (empty($defaultDate)) {
+            return $this->getSystemDefaultPeriod();
         }
 
         if (in_array($defaultDate, array('today', 'yesterday'))) {
@@ -113,7 +116,12 @@ class UserPreferences
             return 'range';
         }
 
-        return $defaultPeriod;
+        return $defaultDate;
+    }
+
+    private function getSystemDefaultPeriod()
+    {
+        return Config::getInstance()->General['default_period'];
     }
 
 }
\ No newline at end of file