diff --git a/public/app/core/components/dashboard_selector.ts b/public/app/core/components/dashboard_selector.ts
new file mode 100644
index 00000000000..ada4866f98e
--- /dev/null
+++ b/public/app/core/components/dashboard_selector.ts
@@ -0,0 +1,28 @@
+///<reference path="../../headers/common.d.ts" />
+
+import config from 'app/core/config';
+import _ from 'lodash';
+import $ from 'jquery';
+import coreModule from 'app/core/core_module';
+
+var template = `
+`;
+
+export class DashboardSelectorCtrl {
+
+  /** @ngInject */
+  constructor(private $scope, private $rootScope) {
+  }
+}
+
+export function dashboardSelector() {
+  return {
+    restrict: 'E',
+    controller: DashboardSelectorCtrl,
+    bindToController: true,
+    controllerAs: 'ctrl',
+    template: template,
+  };
+}
+
+coreModule.directive('dashboardSelector', dashboardSelector);
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index 33b1a247235..ca591c0c481 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -62,66 +62,67 @@
         </gf-form-switch>
       </div>
     </div>
-  </div>
 
-  <div ng-if="editor.index == 1">
-    <h5 class="section-heading">Rows settings</h5>
+	</div>
 
-    <div class="gf-form-group">
-      <div class="gf-form-inline" ng-repeat="row in dashboard.rows">
-        <div class="gf-form">
-          <span class="gf-form-label">Title</span>
-          <input type="text" class="gf-form-input max-width-14" ng-model='row.title'></input>
-        </div>
-        <gf-form-switch class="gf-form" label="Show title" checked="row.showTitle" switch-class="max-width-6"></gf-form-switch>
+	<div ng-if="editor.index == 1">
+		<h5 class="section-heading">Rows settings</h5>
 
-        <div class="gf-form">
-          <button class="btn btn-inverse gf-form-btn" ng-click="_.move(dashboard.rows,$index,$index-1)">
-            <i ng-class="{'invisible': $first}" class="fa fa-arrow-up"></i>
-          </button>
-          <button class="btn btn-inverse gf-from-btn" ng-click="_.move(dashboard.rows,$index,$index+1)">
-            <i ng-class="{'invisible': $last}" class="fa fa-arrow-down"></i>
-          </button>
-          <button class="btn btn-inverse gf-form-btn" click="dashboard.rows = _.without(dashboard.rows,row)">
-            <i class="fa fa-trash"></i>
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
+		<div class="gf-form-group">
+			<div class="gf-form-inline" ng-repeat="row in dashboard.rows">
+				<div class="gf-form">
+					<span class="gf-form-label">Title</span>
+					<input type="text" class="gf-form-input max-width-14" ng-model='row.title'></input>
+				</div>
+				<gf-form-switch class="gf-form" label="Show title" checked="row.showTitle" switch-class="max-width-6"></gf-form-switch>
 
-  <div ng-if="editor.index == 2">
-    <dash-links-editor></dash-links-editor>
-  </div>
+				<div class="gf-form">
+					<button class="btn btn-inverse gf-form-btn" ng-click="_.move(dashboard.rows,$index,$index-1)">
+						<i ng-class="{'invisible': $first}" class="fa fa-arrow-up"></i>
+					</button>
+					<button class="btn btn-inverse gf-from-btn" ng-click="_.move(dashboard.rows,$index,$index+1)">
+						<i ng-class="{'invisible': $last}" class="fa fa-arrow-down"></i>
+					</button>
+					<button class="btn btn-inverse gf-form-btn" click="dashboard.rows = _.without(dashboard.rows,row)">
+						<i class="fa fa-trash"></i>
+					</button>
+				</div>
+			</div>
+		</div>
+	</div>
 
-  <div ng-if="editor.index == 3">
-    <gf-time-picker-settings dashboard="dashboard"></gf-time-picker-settings>
-  </div>
+	<div ng-if="editor.index == 2">
+		<dash-links-editor></dash-links-editor>
+	</div>
 
-  <div ng-if="editor.index == 4">
-    <h5 class="section-heading">Dashboard info</h5>
-    <div class="gf-form-group">
-      <div class="gf-form">
-        <span class="gf-form-label width-10">Last updated at:</span>
-        <span class="gf-form-label width-18">{{formatDate(dashboardMeta.updated)}}</span>
-      </div>
-      <div class="gf-form">
-        <span class="gf-form-label width-10">Last updated by:</span>
-        <span class="gf-form-label width-18">{{dashboardMeta.updatedBy}}&nbsp;</span>
-      </div>
-      <div class="gf-form">
-        <span class="gf-form-label width-10">Created at:</span>
-        <span class="gf-form-label width-18">{{formatDate(dashboardMeta.created)}}&nbsp;</span>
-      </div>
-      <div class="gf-form">
-        <span class="gf-form-label width-10">Created by:</span>
-        <span class="gf-form-label width-18">{{dashboardMeta.createdBy}}&nbsp;</span>
-      </div>
-      <div class="gf-form">
-        <span class="gf-form-label width-10">Current version:</span>
-        <span class="gf-form-label width-18">{{dashboardMeta.version}}&nbsp;</span>
-      </div>
-    </div>
-  </div>
+	<div ng-if="editor.index == 3">
+		<gf-time-picker-settings dashboard="dashboard"></gf-time-picker-settings>
+	</div>
+
+	<div ng-if="editor.index == 4">
+		<h5 class="section-heading">Dashboard info</h5>
+		<div class="gf-form-group">
+			<div class="gf-form">
+				<span class="gf-form-label width-10">Last updated at:</span>
+				<span class="gf-form-label width-18">{{formatDate(dashboardMeta.updated)}}</span>
+			</div>
+			<div class="gf-form">
+				<span class="gf-form-label width-10">Last updated by:</span>
+				<span class="gf-form-label width-18">{{dashboardMeta.updatedBy}}&nbsp;</span>
+			</div>
+			<div class="gf-form">
+				<span class="gf-form-label width-10">Created at:</span>
+				<span class="gf-form-label width-18">{{formatDate(dashboardMeta.created)}}&nbsp;</span>
+			</div>
+			<div class="gf-form">
+				<span class="gf-form-label width-10">Created by:</span>
+				<span class="gf-form-label width-18">{{dashboardMeta.createdBy}}&nbsp;</span>
+			</div>
+			<div class="gf-form">
+				<span class="gf-form-label width-10">Current version:</span>
+				<span class="gf-form-label width-18">{{dashboardMeta.version}}&nbsp;</span>
+			</div>
+		</div>
+	</div>
 </div>
 
diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html
index 042344eeac6..0d6e5fb2951 100644
--- a/public/app/features/profile/partials/profile.html
+++ b/public/app/features/profile/partials/profile.html
@@ -10,21 +10,25 @@
 		<h3 class="page-heading">Preferences</h3>
 
 		<div class="gf-form">
-			<span class="gf-form-label width-7">Name</span>
+			<span class="gf-form-label width-9">Name</span>
 			<input class="gf-form-input max-width-21" type="text" required ng-model="user.name" >
 		</div>
 		<div class="gf-form">
-			<span class="gf-form-label width-7">Email</span>
+			<span class="gf-form-label width-9">Email</span>
 			<input class="gf-form-input max-width-21" type="email" required ng-model="user.email">
 		</div>
 		<div class="gf-form">
-			<span class="gf-form-label width-7">Username</span>
+			<span class="gf-form-label width-9">Username</span>
 			<input class="gf-form-input max-width-21" type="text" required ng-model="user.login">
 		</div>
 		<div class="gf-form">
-			<span class="gf-form-label width-7">UI Theme</span>
+			<span class="gf-form-label width-9">UI Theme</span>
 			<select class="gf-form-input gf-size-auto" ng-model="user.theme" ng-options="f for f in ['dark', 'light']"></select>
 		</div>
+		<div class="gf-form">
+			<span class="gf-form-label width-9">Home Dashboard</span>
+			<dashboard-selector model="user.homeDashboardId"></dashboard-selector>
+		</div>
 
 		<div class="gf-form-button-row">
 			<button type="submit" class="btn btn-success" ng-click="update()">Update</button>