diff --git a/app/navigation/Navigator.scala b/app/navigation/Navigator.scala
index 5f2901ca..79da37f3 100644
--- a/app/navigation/Navigator.scala
+++ b/app/navigation/Navigator.scala
@@ -31,7 +31,12 @@ class Navigator @Inject() () {
   private val normalRoutes: Page => UserAnswers => Call = {
 
     case NameOfFinancialInstitutionPage =>
-      _ => routes.HaveUniqueTaxpayerReferenceController.onPageLoad(NormalMode)
+      userAnswers =>
+        isFiUser(
+          userAnswers,
+          routes.SendReportsController.onPageLoad(NormalMode),
+          routes.HaveUniqueTaxpayerReferenceController.onPageLoad(NormalMode)
+        )
     case WhatIsUniqueTaxpayerReferencePage =>
       _ => routes.SendReportsController.onPageLoad(NormalMode)
     case SendReportsPage =>
diff --git a/test/navigation/NavigatorSpec.scala b/test/navigation/NavigatorSpec.scala
index cbce20e4..3f9b7d57 100644
--- a/test/navigation/NavigatorSpec.scala
+++ b/test/navigation/NavigatorSpec.scala
@@ -110,7 +110,13 @@ class NavigatorSpec extends SpecBase {
           routes.CheckYourAnswersController.onPageLoad
       }
 
-      "must go from NameOfFinancialInstitutionPage to HaveUniqueTaxpayerReferencePage" in {
+      "must go from NameOfFinancialInstitutionPage to SendReportsPage when user is FI" in {
+        val userAnswers = emptyUserAnswers.withPage(ReportForRegisteredBusinessPage, true)
+        navigator.nextPage(NameOfFinancialInstitutionPage, NormalMode, userAnswers) mustBe
+          routes.SendReportsController.onPageLoad(NormalMode)
+      }
+
+      "must go from NameOfFinancialInstitutionPage to HaveUniqueTaxpayerReferencePage when user is not FI" in {
         val userAnswers = emptyUserAnswers.withPage(NameOfFinancialInstitutionPage, "FI")
         navigator.nextPage(NameOfFinancialInstitutionPage, NormalMode, userAnswers) mustBe
           routes.HaveUniqueTaxpayerReferenceController.onPageLoad(NormalMode)