diff --git a/include/admin/overview.inc.php b/include/admin/overview.inc.php
index 91d24511..6eff4ce7 100644
--- a/include/admin/overview.inc.php
+++ b/include/admin/overview.inc.php
@@ -52,14 +52,6 @@ $data['update']       = version_compare($data['usedVersion'], $data['curVersion'
 serendipity_plugin_api::hook_event('plugin_dashboard_updater', $output, $data['curVersion']);
 $data['updateButton'] = $output;
 
-// Can be set through serendipity_config_local.inc.php
-if (!isset($serendipity['dashboardCommentsLimit'])) {
-    $serendipity['dashboardCommentsLimit'] = 5;
-}
-if (!isset($serendipity['dashboardEntriesLimit'])) {
-    $serendipity['dashboardEntriesLimit'] = 5;
-}
-
 $cjoin  = ($serendipity['serendipityUserlevel'] == USERLEVEL_EDITOR) ? "
         LEFT JOIN {$serendipity['dbPrefix']}authors a ON (e.authorid = a.authorid)
             WHERE e.authorid = " . (int)$serendipity['authorid']
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index 66502452..589a89d2 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -144,6 +144,15 @@ if (!isset($serendipity['backendBlogtitleFirst'])) {
     $serendipity['backendBlogtitleFirst'] = false;
 }
 
+// Dashboard: set number of comments and drafts / future entries to be shown
+if (!isset($serendipity['dashboardCommentsLimit'])) {
+    $serendipity['dashboardCommentsLimit'] = 5;
+}
+
+if (!isset($serendipity['dashboardEntriesLimit'])) {
+    $serendipity['dashboardEntriesLimit'] = 5;
+}
+
 // Available languages
 if (!isset($serendipity['languages'])) {
     $serendipity['languages'] = array('en' => 'English',