diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
index 6183151c2a..969622abdb 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbsections.directive.js
@@ -3,7 +3,7 @@
 * @name umbraco.directives.directive:umbSections
 * @restrict E
 **/
-function sectionsDirective($timeout, $window, navigationService, treeService, sectionResource, appState, eventsService, $location) {
+function sectionsDirective($timeout, $window, navigationService, treeService, sectionService, appState, eventsService, $location) {
     return {
         restrict: "E",    // restrict to an element
         replace: true,   // replace the html element with the template
@@ -31,7 +31,7 @@ function sectionsDirective($timeout, $window, navigationService, treeService, se
             };
 
 			function loadSections(){
-				sectionResource.getSections()
+			    sectionService.getSectionsForUser()
 					.then(function (result) {
 						scope.sections = result;
 						calculateHeight();
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/section.service.js b/src/Umbraco.Web.UI.Client/src/common/services/section.service.js
new file mode 100644
index 0000000000..e563a83722
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/common/services/section.service.js
@@ -0,0 +1,43 @@
+/**
+ * @ngdoc service
+ * @name umbraco.services.sectionService
+ *
+ *  
+ * @description
+ * A service to return the sections (applications) to be listed in the navigation which are contextual to the current user
+ */
+(function () {
+    'use strict';
+
+    function sectionService(userService, $q, sectionResource) {
+
+        function getSectionsForUser() {
+            var deferred = $q.defer();
+            userService.getCurrentUser().then(function (u) {
+                //if they've already loaded, return them
+                if (u.sections) {
+                    deferred.resolve(u.sections);
+                }
+                else {
+                    sectionResource.getSections().then(function (sections) {
+                        //set these to the user (cached), then the user changes, these will be wiped
+                        u.sections = sections;
+                        deferred.resolve(u.sections);
+                    });   
+                }                
+            });
+            return deferred.promise;
+        }
+        
+        var service = {
+            getSectionsForUser: getSectionsForUser
+        };
+
+        return service;
+
+    }
+
+    angular.module('umbraco.services').factory('sectionService', sectionService);
+
+
+})();
diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js
index 7eafd7106d..2fb5f9beee 100644
--- a/src/Umbraco.Web.UI.Client/src/routes.js
+++ b/src/Umbraco.Web.UI.Client/src/routes.js
@@ -101,22 +101,28 @@ app.config(function ($routeProvider) {
             //This allows us to dynamically change the template for this route since you cannot inject services into the templateUrl method.
             template: "<div ng-include='templateUrl'></div>",
             //This controller will execute for this route, then we can execute some code in order to set the template Url
-            controller: function ($scope, $route, $routeParams, $location) {
+            controller: function ($scope, $route, $routeParams, $location, sectionService) {
                 if ($routeParams.section.toLowerCase() === "default" || $routeParams.section.toLowerCase() === "umbraco" || $routeParams.section === "") {
                     $routeParams.section = "content";
                 }
 
-                //TODO: Here we could run some extra logic to check if the dashboard we are navigating
-                //to has any content to show and if not it could redirect to the first tree root path. 
-                //BUT! this would mean that we'd need a server side call to check this data....
-                //Instead we already have this data in the sections returned from the sectionResource but we
-                //don't want to cache data in a resource so we'd have to create a sectionService which would rely 
-                //on the userService, then we update the umbsections.directive to use the sectionService and when the 
-                //sectionService requests the sections, it caches the result against the current user. Then we can 
-                //use the sectionService here to do the redirection.
-
-                $routeParams.url = "dashboard.aspx?app=" + $routeParams.section;
-                $scope.templateUrl = 'views/common/dashboard.html';    
+                //We are going to check the currently loaded sections for the user and if the section we are navigating
+                //to has a custom route path we'll use that 
+                sectionService.getSectionsForUser().then(function(sections) {
+                    //find the one we're requesting
+                    var found = _.find(sections, function(s) {
+                        return s.alias === $routeParams.section;
+                    })
+                    if (found && found.routePath) {
+                        //there's a custom route path so redirect
+                        $location.path(found.routePath);
+                    }
+                    else {
+                        //there's no custom route path so continue as normal
+                        $routeParams.url = "dashboard.aspx?app=" + $routeParams.section;
+                        $scope.templateUrl = 'views/common/dashboard.html';            
+                    }
+                });
             },
             resolve: canRoute(true)
         })