diff --git a/src/app/wholesale/login/page.tsx b/src/app/wholesale/login/page.tsx
index 4c98ec1..55c94a1 100644
--- a/src/app/wholesale/login/page.tsx
+++ b/src/app/wholesale/login/page.tsx
@@ -14,7 +14,7 @@ const BRANDS = [
   { id: "64294306-5f42-463d-a5e8-2ad6c81a96de", name: "Tuxedo Corn", slug: "tuxedo" },
 ];
 
-function BrandLogo({ name }: { name: string }) {
+function BrandLogo() {
   return (
     <div className="flex h-10 w-10 items-center justify-center rounded-xl bg-emerald-900/60 border border-emerald-700/50">
       <svg className="h-5 w-5 text-emerald-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={1.5}>
@@ -119,7 +119,7 @@ export default function WholesaleLoginPage() {
       <div className="bg-zinc-900 border-b border-zinc-800">
         <div className="mx-auto max-w-5xl px-6 py-4 flex items-center justify-between">
           <div className="flex items-center gap-3">
-            <BrandLogo name={selectedBrand.name} />
+            <BrandLogo />
             <div>
               <p className="font-bold text-base text-zinc-100 leading-none">{selectedBrand.name}</p>
               <p className="text-xs text-zinc-500 mt-0.5">Wholesale Portal</p>
diff --git a/src/components/water/WaterFieldClient.tsx b/src/components/water/WaterFieldClient.tsx
index 4dfd5fd..f8c640e 100644
--- a/src/components/water/WaterFieldClient.tsx
+++ b/src/components/water/WaterFieldClient.tsx
@@ -133,7 +133,6 @@ function WaterFieldInner() {
   });
   const [pin, setPin] = useState("");
   const [irrigatorName, setIrrigatorName] = useState("");
-  const [selectedRole, setSelectedRole] = useState<"irrigator" | "water_admin" | null>(null);
   const [headgates, setHeadgates] = useState<Headgate[]>([]);
   const [selectedHeadgate, setSelectedHeadgate] = useState("");
   const [headgateLocked, setHeadgateLocked] = useState(false);
@@ -396,13 +395,13 @@ function WaterFieldInner() {
           <p className="text-stone-500 text-center mb-8">{t.whoAreYou}</p>
           <div className="flex flex-col gap-4">
             <button
-              onClick={() => { setSelectedRole("irrigator"); setStep("pin"); }}
+              onClick={() => { setStep("pin"); }}
               className="w-full rounded-xl bg-white px-6 py-5 text-xl font-semibold text-stone-900 shadow-sm ring-1 ring-stone-200 hover:bg-stone-50 min-h-[64px]"
             >
               Irrigator
             </button>
             <button
-              onClick={() => { setSelectedRole("water_admin"); setStep("pin"); }}
+              onClick={() => { setStep("pin"); }}
               className="w-full rounded-xl bg-stone-900 px-6 py-5 text-xl font-semibold text-white shadow-sm ring-1 ring-stone-700 hover:bg-stone-800 min-h-[64px]"
             >
               Admin
@@ -496,7 +495,10 @@ function WaterFieldInner() {
         </div>
       </div>
 
-      <div className="mx-auto max-w-lg px-4 py-6 space-y-5">
+      <form
+        onSubmit={handleSubmitEntry}
+        className="mx-auto max-w-lg px-4 py-6 space-y-5"
+      >
         {/* Success banner */}
         {success && (
           <div className="rounded-xl bg-green-100 border border-green-200 px-4 py-4 text-center text-green-800 font-semibold">
@@ -688,7 +690,7 @@ function WaterFieldInner() {
         {loading && (
           <p className="text-center text-xs text-stone-400 mt-1">Submitting your reading...</p>
         )}
-      </div>
+      </form>
     </div>
   );
 }