diff --git a/Frontend/patient_manager/lib/router/routeGenerator.dart b/Frontend/patient_manager/lib/router/routeGenerator.dart
index e30ac23e..3ea57127 100644
--- a/Frontend/patient_manager/lib/router/routeGenerator.dart
+++ b/Frontend/patient_manager/lib/router/routeGenerator.dart
@@ -3,6 +3,8 @@ import 'package:patient_manager/Authentication/authCheck.dart';
 import 'package:patient_manager/components/addOrViewPatient.dart';
 import 'package:patient_manager/objects/appUser.dart';
 import 'package:patient_manager/objects/arguments.dart';
+import 'package:patient_manager/pages/authentication/forgotPassword.dart';
+import 'package:patient_manager/pages/authentication/resetPassword.dart';
 import 'package:patient_manager/pages/fullScreenFile.dart';
 import 'package:patient_manager/pages/patientAccessReview.dart';
 import 'package:patient_manager/pages/patientAdd.dart';
@@ -17,135 +19,157 @@ class RouteGenerator {
   static Route<dynamic> generateRoute(RouteSettings settings) {
     final args = settings.arguments;
 
-    switch (settings.name) {
-      // Home or Sign in or Register Pages
-      case '/':
-        return MaterialPageRoute(
-            settings: settings, builder: (_) => const AuthCheck());
-      //===============================================================
+    // Internal Navigation
+    if (Uri.base.path == "/") {
+      switch (settings.name) {
+        // Authgentication
+        case '/':
+          return MaterialPageRoute(
+              settings: settings, builder: (_) => const AuthCheck());
+        case '/forgot-password':
+          return MaterialPageRoute(
+              settings: settings, builder: (_) => const ForgotPassword());
+        //http://mzansi-innovation-hub.co.za/auth/reset-password
 
-      //User Profile
-      case '/user-profile':
-        if (args is AppProfileUpdateArguments) {
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => ProfileUserUpdate(
-              arguments: args,
-            ),
-          );
-        }
-        return _errorRoute();
-      //===============================================================
+        //===============================================================
 
-      //Business Profile Pages
-      case '/business-profile':
-        if (args is BusinessArguments) {
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => ProfileBusinessUpdate(
-              arguments: args,
-            ),
-          );
-        }
-        return _errorRoute();
-      case '/business-profile/set-up':
-        if (args is AppUser) {
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => ProfileBusinessAdd(
-              signedInUser: args,
-            ),
-          );
-        }
-        return _errorRoute();
-      //===============================================================
+        //User Profile
+        case '/user-profile':
+          if (args is AppProfileUpdateArguments) {
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => ProfileUserUpdate(
+                arguments: args,
+              ),
+            );
+          }
+          return _errorRoute();
+        //===============================================================
 
-      // Patient Profile Pages
-      case '/patient-profile':
-        if (args is PatientViewArguments) {
-          //print("route generator: $args");
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => AddOrViewPatient(
-              arguments: args,
-            ),
-          );
-        }
-        return _errorRoute();
-      case '/patient-profile/set-up':
-        if (args is AppUser) {
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => AddPatient(
-              signedInUser: args,
-            ),
-          );
-        }
-        return _errorRoute();
-      case '/patient-profile/edit':
-        if (args is PatientEditArguments) {
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => EditPatient(
-              signedInUser: args.signedInUser,
-              selectedPatient: args.selectedPatient,
-            ),
-          );
-        }
-        return _errorRoute();
-      //===============================================================
+        //Business Profile Pages
+        case '/business-profile':
+          if (args is BusinessArguments) {
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => ProfileBusinessUpdate(
+                arguments: args,
+              ),
+            );
+          }
+          return _errorRoute();
+        case '/business-profile/set-up':
+          if (args is AppUser) {
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => ProfileBusinessAdd(
+                signedInUser: args,
+              ),
+            );
+          }
+          return _errorRoute();
+        //===============================================================
 
-      // Access Review Page
-      case '/access-review':
-        if (args is AppUser) {
-          //print("route generator: $args");
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => PatientAccessRequest(
-              signedInUser: args,
-            ),
-          );
-        }
-        return _errorRoute();
-      //===============================================================
+        // Patient Profile Pages
+        case '/patient-profile':
+          if (args is PatientViewArguments) {
+            //print("route generator: $args");
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => AddOrViewPatient(
+                arguments: args,
+              ),
+            );
+          }
+          return _errorRoute();
+        case '/patient-profile/set-up':
+          if (args is AppUser) {
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => AddPatient(
+                signedInUser: args,
+              ),
+            );
+          }
+          return _errorRoute();
+        case '/patient-profile/edit':
+          if (args is PatientEditArguments) {
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => EditPatient(
+                signedInUser: args.signedInUser,
+                selectedPatient: args.selectedPatient,
+              ),
+            );
+          }
+          return _errorRoute();
+        //===============================================================
 
-      //Patient Manager Pages
-      case '/patient-manager':
-        if (args is BusinessArguments) {
-          //print("route generator: $args");
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => PatientManager(
-              arguments: args,
-            ),
-          );
-        }
-        return _errorRoute();
-      case '/patient-manager/patient':
-        if (args is PatientViewArguments) {
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => PatientView(
-              arguments: args,
-            ),
-          );
-        }
-        return _errorRoute();
-      //===============================================================
+        // Access Review Page
+        case '/access-review':
+          if (args is AppUser) {
+            //print("route generator: $args");
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => PatientAccessRequest(
+                signedInUser: args,
+              ),
+            );
+          }
+          return _errorRoute();
+        //===============================================================
 
-      //Full Screen File Viewer
-      case '/file-veiwer':
-        if (args is FileViewArguments) {
-          return MaterialPageRoute(
-            settings: settings,
-            builder: (_) => FullScreenFileViewer(
-              arguments: args,
-            ),
-          );
-        }
-        return _errorRoute();
+        //Patient Manager Pages
+        case '/patient-manager':
+          if (args is BusinessArguments) {
+            //print("route generator: $args");
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => PatientManager(
+                arguments: args,
+              ),
+            );
+          }
+          return _errorRoute();
+        case '/patient-manager/patient':
+          if (args is PatientViewArguments) {
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => PatientView(
+                arguments: args,
+              ),
+            );
+          }
+          return _errorRoute();
+        //===============================================================
+
+        //Full Screen File Viewer
+        case '/file-veiwer':
+          if (args is FileViewArguments) {
+            return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => FullScreenFileViewer(
+                arguments: args,
+              ),
+            );
+          }
+          return _errorRoute();
+      }
+      throw '';
+    }
+    // External Links Navigation
+    else {
+      var extPath = Uri.base.path;
+      //print("query Param: ${Uri.base.queryParameters['token']}");
+      switch (extPath) {
+        case '/auth/reset-password':
+          return MaterialPageRoute(
+              settings: settings,
+              builder: (_) => ResetPassword(
+                    token: Uri.base.queryParameters['token'],
+                  ));
+      }
+      throw '';
     }
-    throw '';
   }
 }