diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts
index fdf86ea1..cdcb73cf 100644
--- a/src/app/app.routes.ts
+++ b/src/app/app.routes.ts
@@ -4,14 +4,13 @@ import {PagesRoutes} from "./pages/pages.routes";
 import {RegisterRoutes} from "./pages/register/register.routes";
 
 export const routes: RouterConfig = [
-  {
-    path: '',
-    redirectTo: '/pages/dashboard',
-    terminal: true
-  },
   ...LoginRoutes,
   ...RegisterRoutes,
-  ...PagesRoutes
+  ...PagesRoutes,
+  {
+    path: '**',
+    redirectTo: '/pages/dashboard'
+  },
 ];
 
 export const APP_ROUTER_PROVIDERS = [
diff --git a/src/app/pages/login/login.routes.ts b/src/app/pages/login/login.routes.ts
index f928f345..2bf1df36 100644
--- a/src/app/pages/login/login.routes.ts
+++ b/src/app/pages/login/login.routes.ts
@@ -1,12 +1,8 @@
 import {RouterConfig} from '@angular/router';
 import {Login} from './login.component';
 
+//noinspection TypeScriptValidateTypes
 export const LoginRoutes: RouterConfig = [
-  {
-    path: '',
-    redirectTo: '/login',
-    terminal: true
-  },
   {
     path: 'login',
     component: Login
diff --git a/src/app/pages/register/register.routes.ts b/src/app/pages/register/register.routes.ts
index 1aff448b..a6d577a8 100644
--- a/src/app/pages/register/register.routes.ts
+++ b/src/app/pages/register/register.routes.ts
@@ -1,12 +1,8 @@
 import {RouterConfig} from '@angular/router';
 import {Register} from './register.component';
 
+//noinspection TypeScriptValidateTypes
 export const RegisterRoutes: RouterConfig = [
-  {
-    path: '',
-    redirectTo: '/register',
-    terminal: true
-  },
   {
     path: 'register',
     component: Register