diff --git a/src/app/(app)/profile/page.tsx b/src/app/(app)/profile/page.tsx
index 78ef18e..77dc70d 100644
--- a/src/app/(app)/profile/page.tsx
+++ b/src/app/(app)/profile/page.tsx
@@ -39,9 +39,9 @@ const Profile: React.FC = () => {
             data.secondInterest,
             data.thirdInterest,
           ]
-          const matchedFaculties = faculties.filter((faculty) =>
-            interests.includes(faculty.th)
-          )
+          const matchedFaculties = faculties
+            .filter((faculty) => interests.includes(faculty.th))
+            .sort((a, b) => interests.indexOf(a.th) - interests.indexOf(b.th))
           setFavFaculties(matchedFaculties)
         }
       } catch (error) {
diff --git a/src/components/register/subpages/pdpa.tsx b/src/components/register/subpages/pdpa.tsx
index a628580..a15ec74 100644
--- a/src/components/register/subpages/pdpa.tsx
+++ b/src/components/register/subpages/pdpa.tsx
@@ -110,6 +110,7 @@ const Pdpa: React.FC<PdpaProps> = ({
         <div className='text-center'>
           <Button
             className='font-cloud-soft text-2xl font-medium'
+            disabled={!isValid}
             variant={isValid ? 'filled' : 'disabled'}
             onClick={onNext}
           >
diff --git a/src/middleware.ts b/src/middleware.ts
index 939def4..1a97f6a 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -68,5 +68,6 @@ export const config = {
     '/faculties',
     '/workshop',
     '/pick-your-flower',
+    '/suchibat',
   ],
 }