diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 49a58426f..12a5180c8 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -24,11 +24,11 @@ class DashboardController extends ActionController
      * @var Dashboard;
      */
     private $dashboard;
-    
+
     public function init()
     {
         $this->dashboard = new Dashboard();
-        $this->dashboard->setUser($this->getRequest()->getUser());
+        $this->dashboard->setUser($this->Auth()->getUser());
         $this->dashboard->load();
     }
 
diff --git a/library/Icinga/Web/Widget/Dashboard.php b/library/Icinga/Web/Widget/Dashboard.php
index fe4bba803..bb62cc8f9 100644
--- a/library/Icinga/Web/Widget/Dashboard.php
+++ b/library/Icinga/Web/Widget/Dashboard.php
@@ -9,7 +9,6 @@ use Icinga\Application\Config;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\NotReadableError;
 use Icinga\Exception\ProgrammingError;
-use Icinga\Exception\SystemPermissionException;
 use Icinga\User;
 use Icinga\Web\Widget\Dashboard\Pane;
 use Icinga\Web\Widget\Dashboard\Dashlet as DashboardDashlet;
@@ -425,28 +424,8 @@ class Dashboard extends AbstractWidget
     public function getConfigFile()
     {
         if ($this->user === null) {
-            return '';
+            throw new ProgrammingError('Can\'t load dashboards. User is not set');
         }
-
-        $baseDir = '/var/lib/icingaweb';
-
-        if (! file_exists($baseDir)) {
-            throw new NotReadableError('Could not read: ' . $baseDir);
-        }
-
-        $userDir = $baseDir . '/' . $this->user->getUsername();
-
-        if (! file_exists($userDir)) {
-            $success = @mkdir($userDir);
-            if (!$success) {
-                throw new SystemPermissionException('Could not create: ' . $userDir);
-            }
-        }
-
-        if (! file_exists($userDir)) {
-            throw new NotReadableError('Could not read: ' . $userDir);
-        }
-
-        return $userDir . '/dashboard.ini';
+        return Config::resolvePath('dashboards/' . $this->user->getUsername() . '/dashboard.ini');
     }
 }