diff --git a/modules/kegiatan-proker-new.html b/modules/kegiatan-proker-new.html
index 92f4e45..006f893 100644
--- a/modules/kegiatan-proker-new.html
+++ b/modules/kegiatan-proker-new.html
@@ -55,10 +55,12 @@
         if (selector) return $(thisDialog.box).find(selector);
         return $(thisDialog.box);
     }
+    µ('#startDate')[0].min= `${(new Date()).getFullYear()}-01-01`;
+    µ('#startMonth')[0].min= `${(new Date()).getFullYear()}-01`;
     µ('#targetUnit').change(()=>{
         µ('.forDay').prop("hidden", µ('#targetUnit').val() != "0");
         µ('.forMonth').prop("hidden", µ('#targetUnit').val() != "1");
-        µ('#startDay').val("");
+        µ('#startDate').val("");
         µ('#startMonth').val("");
     });
     µ('#submit').click(async()=>{
diff --git a/modules/kegiatan.html b/modules/kegiatan.html
index ea52ca1..549e553 100644
--- a/modules/kegiatan.html
+++ b/modules/kegiatan.html
@@ -1,7 +1,7 @@
 <div style="text-align: center; font-weight: 600; margin: .8em 0; font-size: 1.2em;">
     Program Kerja Agen Perubahan
 </div>
-<div style="display: flex; justify-content: space-between; padding: 0 2.5ch;">
+<div style="display: flex; justify-content: space-between; padding: 0 0 0 2.5ch;">
     <span>Tahun:&nbsp;
         <select id="pkYear" style="width: max-content;">
 
@@ -137,8 +137,9 @@
         $('#proker #pkContent').prop("hidden", prokers.length < 1);
         $('#proker #pkContent').empty();
         const listedProkers = prokers.filter(e=>e.year == Number($('#pkYear').val()));
-        $('#newProker').prop("disabled",((listedProkers.length > 0 && listedProkers[0].year < (new Date()).getFullYear())) ||(listedProkers.length > 0 && listedProkers[0].year <= (new Date()).getFullYear() && listedProkers[0].journal.at(-1).status > 1));
-        $('#submitProker').prop("disabled",!(listedProkers.length > 0 && listedProkers[0].journal.at(-1).status < 2));
+        const currProker = prokers.filter(e=>e.year == (new Date()).getFullYear());
+        $('#newProker').prop("disabled",currProker?.at(0)?.journal?.at(-1).status > 1);
+        $('#submitProker').prop("disabled",(!(listedProkers.length > 0 && listedProkers[0].journal.at(-1).status < 2) || (listedProkers.length > 0 && listedProkers[0].year < (new Date()).getFullYear())));
         const statusStyles =[
             "text-align: center; background-color: var(--secondary-foreground); color: var(--primary-background)",
             "text-align: center; background-color: var(--neutral-n-accent); color: var(--primary-foreground)",