diff --git a/html/pages/edituser.inc.php b/html/pages/edituser.inc.php
index 61bc615f9..c07c48037 100644
--- a/html/pages/edituser.inc.php
+++ b/html/pages/edituser.inc.php
@@ -312,6 +312,10 @@ else {
                         }
                     }
 
+                    if (!empty($vars['dashboard'])) {
+                        dbUpdate(array('dashboard'=>$vars['dashboard']),'users','user_id = ?',array($vars['user_id']));
+                    }
+
                     echo "<form class='form-horizontal' role='form' method='post' action=''>
   <input type='hidden' name='user_id' value='".$vars['user_id']."'>
   <input type='hidden' name='cur_username' value='" . $users_details['username'] . "'>
@@ -374,6 +378,18 @@ if (passwordscanchange($users_details['username'])) {
         </div>
         ";
 }
+    echo "
+       <div class='form-group'>
+           <label for='dashboard' class='col-sm-2 control-label'>Dashboard</label>
+           <div class='col-sm-4'><select class='form-control' name='dashboard'>";
+    $defdash = dbFetchCell("SELECT dashboard FROM users WHERE user_id = ?",array($vars['user_id']));
+    foreach(dbFetchRows("SELECT dashboards.*,users.username FROM `dashboards` INNER JOIN `users` ON users.user_id = dashboards.user_id WHERE (dashboards.access > 0 && dashboards.user_id != ?) || dashboards.user_id = ?",array($vars['user_id'],$vars['user_id'])) as $dash) {
+        echo "<option value='".$dash['dashboard_id']."'".($defdash == $dash['dashboard_id'] ? ' selected' : '').">".$dash['dashboard_name']."</option>";
+    }
+    echo "</select>
+           </div>
+       </div>
+       ";
 
   echo "<div class='form-group'>
     <div class='col-sm-6'>
diff --git a/html/pages/front/tiles.php b/html/pages/front/tiles.php
index f847d41c1..67b1b8f59 100644
--- a/html/pages/front/tiles.php
+++ b/html/pages/front/tiles.php
@@ -16,8 +16,13 @@
  * Code for Gridster.sort_by_row_and_col_asc(serialization) call is from http://gridster.net/demos/grid-from-serialize.html
  */
 
-$no_refresh = true;
-if (dbFetchCell('SELECT dashboard_id FROM dashboards WHERE user_id=?',array($_SESSION['user_id'])) == 0) {
+$no_refresh   = true;
+$default_dash = 0;
+if (($tmp = dbFetchCell('SELECT dashboard FROM users WHERE user_id=?',array($_SESSION['user_id']))) != 0) {
+    $default_dash = $tmp;
+}
+else if (dbFetchCell('SELECT dashboard_id FROM dashboards WHERE user_id=?',array($_SESSION['user_id'])) == 0) {
+    $tmp = dbInsert(array('dashboard_name'=>'Default','user_id'=>$_SESSION['user_id']),'dashboards');
     $vars['dashboard'] = dbInsert(array('dashboard_name'=>'Default','user_id'=>$_SESSION['user_id']),'dashboards');
     if (dbFetchCell('select 1 from users_widgets where user_id = ? && dashboard_id = ?',array($_SESSION['user_id'],0)) == 1) {
         dbUpdate(array('dashboard_id'=>$vars['dashboard']),'users_widgets','user_id = ? && dashboard_id = ?',array($_SESSION['user_id'],0));
@@ -31,7 +36,12 @@ if (!empty($vars['dashboard'])) {
     }
 }
 if (empty($vars['dashboard'])) {
-    $vars['dashboard'] = dbFetchRow('select * from dashboards where user_id = ? order by dashboard_id limit 1',array($_SESSION['user_id']));
+    if ($default_dash != 0) {
+        $vars['dashboard'] = dbFetchRow('select * from dashboards where dashboard_id = ?',array($default_dash));
+    }
+    else {
+        $vars['dashboard'] = dbFetchRow('select * from dashboards where user_id = ? order by dashboard_id limit 1',array($_SESSION['user_id']));
+    }
     if (isset($orig)) {
         $msg_box[] = array('type' => 'error', 'message' => 'Dashboard <code>#'.$orig.'</code> does not exist! Loaded <code>'.$vars['dashboard']['dashboard_name'].'</code> instead.','title' => 'Requested Dashboard Not Found!');
     }
diff --git a/sql-schema/084.sql b/sql-schema/084.sql
new file mode 100644
index 000000000..b9df6c3d2
--- /dev/null
+++ b/sql-schema/084.sql
@@ -0,0 +1 @@
+ALTER TABLE  `users` ADD  `dashboard` INT( 11 ) DEFAULT 0 NOT NULL;