diff --git a/app/Foundation/Providers/ConfigServiceProvider.php b/app/Foundation/Providers/ConfigServiceProvider.php
index 3297f03a..e777300c 100644
--- a/app/Foundation/Providers/ConfigServiceProvider.php
+++ b/app/Foundation/Providers/ConfigServiceProvider.php
@@ -16,6 +16,13 @@ use CachetHQ\Cachet\Models\Setting as SettingModel;
 use Exception;
 use Illuminate\Support\ServiceProvider;
 
+/**
+ * This is the config service provider class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author Joe Cohen <joe@alt-three.com>
+ */
 class ConfigServiceProvider extends ServiceProvider
 {
     /**
@@ -26,7 +33,16 @@ class ConfigServiceProvider extends ServiceProvider
     public function boot()
     {
         try {
-            $this->app->config->set('setting', $this->app->setting->all());
+            // Get the default settings.
+            $defaultSettings = $this->app->config->get('setting');
+
+            // Get the configured settings.
+            $appSettings = $this->app->setting->all();
+
+            // Merge the settings
+            $settings = array_merge($defaultSettings, $appSettings);
+
+            $this->app->config->set('setting', $settings);
         } catch (Exception $e) {
             //
         }
diff --git a/config/setting.php b/config/setting.php
new file mode 100644
index 00000000..13791dd4
--- /dev/null
+++ b/config/setting.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Dashboard Login Link
+    |--------------------------------------------------------------------------
+    |
+    | Whether to show the dashboard link in the footer by default.
+    |
+    */
+
+    'dashboard_login_link' => true,
+];