diff --git a/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupAuthNavHost.kt b/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupAuthNavHost.kt
index c2ac2e0c..2b53e42c 100644
--- a/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupAuthNavHost.kt
+++ b/app/src/main/java/com/crisiscleanup/navigation/CrisisCleanupAuthNavHost.kt
@@ -7,6 +7,8 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.crisiscleanup.core.appnav.RouteConstant
 import com.crisiscleanup.feature.authentication.navigation.authGraph
+import com.crisiscleanup.feature.authentication.navigation.emailLoginLinkScreen
+import com.crisiscleanup.feature.authentication.navigation.forgotPasswordScreen
 import com.crisiscleanup.feature.authentication.navigation.loginWithEmailScreen
 import com.crisiscleanup.feature.authentication.navigation.navigateToEmailLoginLink
 import com.crisiscleanup.feature.authentication.navigation.navigateToForgotPassword
@@ -41,6 +43,14 @@ fun CrisisCleanupAuthNavHost(
                     closeAuthentication = closeAuthentication,
                     openForgotPassword = navToForgotPassword,
                     openEmailMagicLink = navToEmailMagicLink,
+                    nestedGraphs = {
+                        forgotPasswordScreen(
+                            onBack = onBack,
+                        )
+                        emailLoginLinkScreen(
+                            onBack = onBack,
+                        )
+                    },
                 )
             },
             openLoginWithEmail = navToLoginWithEmail,
diff --git a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/navigation/LoginWithEmailNavigation.kt b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/navigation/LoginWithEmailNavigation.kt
index 6ec081c6..d1e3547f 100644
--- a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/navigation/LoginWithEmailNavigation.kt
+++ b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/navigation/LoginWithEmailNavigation.kt
@@ -12,6 +12,7 @@ fun NavController.navigateToLoginWithEmail() {
 
 fun NavGraphBuilder.loginWithEmailScreen(
     enableBackHandler: Boolean,
+    nestedGraphs: NavGraphBuilder.() -> Unit,
     onBack: () -> Unit,
     closeAuthentication: () -> Unit,
     openForgotPassword: () -> Unit,
@@ -26,4 +27,5 @@ fun NavGraphBuilder.loginWithEmailScreen(
             closeAuthentication = closeAuthentication,
         )
     }
+    nestedGraphs()
 }