diff --git a/src/components/admin/settings/NotifikasiTab.tsx b/src/components/admin/settings/NotifikasiTab.tsx
index d9074bd..673aac9 100644
--- a/src/components/admin/settings/NotifikasiTab.tsx
+++ b/src/components/admin/settings/NotifikasiTab.tsx
@@ -26,8 +26,8 @@ interface NotificationTemplate {
 const RELEVANT_SHORTCODES = {
   'payment_success': ['{nama}', '{email}', '{order_id}', '{tanggal_pesanan}', '{total}', '{metode_pembayaran}', '{produk}', '{link_akses}', '{thank_you_page}'],
   'access_granted': ['{nama}', '{email}', '{produk}', '{link_akses}', '{username_akses}', '{password_akses}', '{kadaluarsa_akses}'],
-  'order_created': ['{nama}', '{email}', '{order_id}', '{tanggal_pesanan}', '{total}', '{metode_pembayaran}', '{produk}', '{payment_link}'],
-  'payment_reminder': ['{nama}', '{email}', '{order_id}', '{tanggal_pesanan}', '{total}', '{metode_pembayaran}', '{batas_pembayaran}', '{jumlah_pembayaran}', '{bank_tujuan}', '{nomor_rekening}', '{payment_link}'],
+  'order_created': ['{nama}', '{email}', '{order_id}', '{tanggal_pesanan}', '{total}', '{metode_pembayaran}', '{produk}', '{payment_link}', '{thank_you_page}'],
+  'payment_reminder': ['{nama}', '{email}', '{order_id}', '{tanggal_pesanan}', '{total}', '{metode_pembayaran}', '{batas_pembayaran}', '{jumlah_pembayaran}', '{bank_tujuan}', '{nomor_rekening}', '{payment_link}', '{thank_you_page}'],
   'consulting_scheduled': ['{nama}', '{email}', '{tanggal_konsultasi}', '{jam_konsultasi}', '{durasi_konsultasi}', '{link_meet}', '{jenis_konsultasi}', '{topik_konsultasi}'],
   'event_reminder': ['{nama}', '{email}', '{judul_event}', '{tanggal_event}', '{jam_event}', '{link_event}', '{lokasi_event}', '{kapasitas_event}'],
   'bootcamp_progress': ['{nama}', '{email}', '{judul_bootcamp}', '{progres_bootcamp}', '{modul_selesai}', '{modul_selanjutnya}', '{link_progress}'],
diff --git a/src/lib/email-templates/master-template.ts b/src/lib/email-templates/master-template.ts
index 5706ff6..1e0ceaf 100644
--- a/src/lib/email-templates/master-template.ts
+++ b/src/lib/email-templates/master-template.ts
@@ -407,7 +407,7 @@ export class ShortcodeProcessor {
     jumlah_pembayaran: 'Rp 1.500.000',
     batas_pembayaran: '22 Desember 2025 23:59',
     payment_link: 'https://accesshub.example.com/checkout',
-    thank_you_page: 'https://accesshub.example.com/access'
+    thank_you_page: 'https://accesshub.example.com/orders/{order_id}'
   };
 
   static process(content: string, customData: Record<string, string> = {}): string {
diff --git a/src/pages/Checkout.tsx b/src/pages/Checkout.tsx
index 3a66e97..abbbeee 100644
--- a/src/pages/Checkout.tsx
+++ b/src/pages/Checkout.tsx
@@ -67,7 +67,7 @@ export default function Checkout() {
 
     if (order?.payment_status === "paid") {
       toast({ title: "Pembayaran berhasil!", description: "Akses produk sudah aktif" });
-      navigate("/access");
+      navigate(`/orders/${oid}`);
     } else {
       toast({ title: "Pembayaran pending", description: "Menunggu konfirmasi pembayaran" });
     }
@@ -196,7 +196,7 @@ export default function Checkout() {
 
     if (order?.payment_status === "paid") {
       toast({ title: "Pembayaran berhasil!", description: "Akses produk sudah aktif" });
-      navigate("/access");
+      navigate(`/orders/${orderId}`);
     } else {
       toast({ title: "Belum ada pembayaran", description: "Silakan selesaikan pembayaran" });
     }