diff --git a/src/registrar/forms/feb.py b/src/registrar/forms/feb.py
index e14e2741e..d4322f512 100644
--- a/src/registrar/forms/feb.py
+++ b/src/registrar/forms/feb.py
@@ -180,9 +180,9 @@ class EOPContactForm(BaseDeletableRegistrarForm):
         if not obj.eop_contact:
             return {}
         return {
-            "first_name": obj.feb_eop_contact.first_name,
-            "last_name": obj.feb_eop_contact.last_name,
-            "email": obj.feb_eop_contact.email,
+            "first_name": obj.eop_contact.first_name,
+            "last_name": obj.eop_contact.last_name,
+            "email": obj.eop_contact.email,
         }
 
     def to_database(self, obj):
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index bd3e22fce..ef6df0151 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -183,9 +183,7 @@ class DomainRequestWizard(TemplateView):
         return PortfolioDomainRequestStep if self.is_portfolio else Step
 
     def requires_feb_questions(self) -> bool:
-        # TODO: remove this
-        return True
-        # return self.domain_request.is_feb() and flag_is_active_for_user(self.request.user, "organization_feature")
+        return self.domain_request.is_feb() and flag_is_active_for_user(self.request.user, "organization_feature")
 
     @property
     def prefix(self):