diff --git a/apps/Frontend/src/components/patients/add-patient-modal.tsx b/apps/Frontend/src/components/patients/add-patient-modal.tsx
index 9b0a9ce..5c0f355 100644
--- a/apps/Frontend/src/components/patients/add-patient-modal.tsx
+++ b/apps/Frontend/src/components/patients/add-patient-modal.tsx
@@ -166,7 +166,7 @@ export const AddPatientModal = forwardRef<
           )}
 
           <Button
-            type="submit"
+            type="button"
             form="patient-form"
             onClick={() => {
               if (patientFormRef.current) {
diff --git a/apps/Frontend/src/pages/dashboard.tsx b/apps/Frontend/src/pages/dashboard.tsx
index ca330fc..e9115da 100644
--- a/apps/Frontend/src/pages/dashboard.tsx
+++ b/apps/Frontend/src/pages/dashboard.tsx
@@ -139,7 +139,7 @@ export default function Dashboard() {
       const res = await apiRequest("POST", "/api/patients/", patient);
       return res.json();
     },
-    onSuccess: () => {
+    onSuccess: (newPatient) => {
       setIsAddPatientOpen(false);
       queryClient.invalidateQueries({ queryKey: ["/api/patients/"] });
       toast({
@@ -147,6 +147,10 @@ export default function Dashboard() {
         description: "Patient added successfully!",
         variant: "default",
       });
+
+      if (addPatientModalRef.current?.shouldSchedule) {
+        addPatientModalRef.current.navigateToSchedule(newPatient.id);
+      }
     },
     onError: (error) => {
       toast({
diff --git a/apps/Frontend/src/pages/patients-page.tsx b/apps/Frontend/src/pages/patients-page.tsx
index 85ebe3d..e29ce43 100644
--- a/apps/Frontend/src/pages/patients-page.tsx
+++ b/apps/Frontend/src/pages/patients-page.tsx
@@ -86,7 +86,6 @@ export default function PatientsPage() {
   const [uploadedFile, setUploadedFile] = useState<File | null>(null);
   const [isUploading, setIsUploading] = useState(false);
   const [isExtracting, setIsExtracting] = useState(false);
-  const [extractedInfo, setExtractedInfo] = useState<any>(null);
 
   // Fetch patients
   const {