diff --git a/susconecta/app/(main-routes)/pacientes/page.tsx b/susconecta/app/(main-routes)/pacientes/page.tsx
index 3f2d75f..d4a25ff 100644
--- a/susconecta/app/(main-routes)/pacientes/page.tsx
+++ b/susconecta/app/(main-routes)/pacientes/page.tsx
@@ -276,7 +276,7 @@ export default function PacientesPage() {
               <div className="grid grid-cols-4 items-center gap-4">
                 <Label className="text-right">Endereço</Label>
                 <span className="col-span-3">
-                  {`${viewingPatient.endereco.logradouro}, ${viewingPatient.endereco.numero} - ${viewingPatient.endereco.bairro}, ${viewingPatient.endereco.cidade} - ${viewingPatient.endereco.estado}`}
+                  {`${viewingPatient.endereco?.logradouro || ''}, ${viewingPatient.endereco?.numero || ''} - ${viewingPatient.endereco?.bairro || ''}, ${viewingPatient.endereco?.cidade || ''} - ${viewingPatient.endereco?.estado || ''}`}
                 </span>
               </div>
                <div className="grid grid-cols-4 items-center gap-4">
diff --git a/susconecta/app/agenda/page.tsx b/susconecta/app/agenda/page.tsx
index 7c6fabb..e639578 100644
--- a/susconecta/app/agenda/page.tsx
+++ b/susconecta/app/agenda/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useRouter } from "next/navigation";
-import { AppointmentForm } from "@/components/forms/appointment-form";
+import { CalendarRegistrationForm } from "@/components/forms/calendar-registration-form";
 import HeaderAgenda from "@/components/agenda/HeaderAgenda";
 import FooterAgenda from "@/components/agenda/FooterAgenda";
 
@@ -10,23 +10,22 @@ export default function NovoAgendamentoPage() {
 
   const handleSave = (data: any) => {
     console.log("Salvando novo agendamento...", data);
-    // Aqui viria a chamada da API para criar um novo agendamento
     alert("Novo agendamento salvo (simulado)!");
-    router.push("/consultas"); // Volta para a lista após salvar
+    router.push("/consultas"); 
   };
 
   const handleCancel = () => {
-    router.back(); // Simplesmente volta para a página anterior
+    router.back(); 
   };
 
   return (
     <div className="min-h-screen flex flex-col bg-white">
       <HeaderAgenda />
       <main className="flex-1 mx-auto w-full max-w-7xl px-8 py-8">
-        <AppointmentForm 
+        <CalendarRegistrationForm 
             onSave={handleSave} 
             onCancel={handleCancel} 
-            initialData={{}} // Passa um objeto vazio para o modo de criação
+            initialData={{}} 
         />
       </main>
       <FooterAgenda />