keycloak-aplcache

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/app.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/app.js
index f010695..cfda116 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/app.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/app.js
@@ -296,8 +296,11 @@ module.config([ '$routeProvider', function($routeProvider) {
             },
             controller : 'ApplicationListCtrl'
         })
-        .otherwise({
+        .when('/', {
             templateUrl : 'partials/home.html'
+        })
+        .otherwise({
+            templateUrl : 'partials/notfound.html'
         });
 } ]);
 

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
index ad9bca4..9edfe52 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
@@ -18,14 +18,6 @@ module.controller('GlobalCtrl', function($scope, $http, Auth, Current, $location
         $scope.fragment = $location.path();
         $scope.path = $location.path().substring(1).split("/");
     });
-
-    $http.get('/auth-server/rest/saas/admin/realms').success(function(data) {
-        Current.realms = data;
-        if (data.length > 0) {
-            Current.realm = data[0];
-            //$location.url("/realms/" + Current.realm.id);
-        }
-    });
 });
 
 module.controller('RealmListCtrl', function($scope, Realm, Current) {

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
index a970a58..a76fb08 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
@@ -229,11 +229,22 @@ module.factory('ApplicationOrigins', function($resource) {
 
 
 
-module.factory('Current', function($resource) {
-    return {
-        realm : null,
-        realms : {},
-        application : null,
-        applications : {}
-    };
+module.factory('Current', function(Realm, $route) {
+    var current = {};
+
+    current.realm = null;
+    current.realms = Realm.query(null, function(realms) {
+        if ($route.current.params.realm) {
+            for (var i = 0; i < realms.length; i++) {
+                if (realms[i].id == $route.current.params.realm) {
+                    current.realm =  realms[i];
+                }
+            }
+        }
+    });
+
+    current.applications = {};
+    current.application = null;
+
+    return current;
 });
\ No newline at end of file

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/notfound.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/notfound.html
new file mode 100755
index 0000000..12b2139
--- /dev/null
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/notfound.html
@@ -0,0 +1,5 @@
+<div id="wrapper" class="container">
+    <div class="row">
+        Page not found
+    </div>
+</div>
\ No newline at end of file