diff --git a/shop/app/my-customers/[id]/page.tsx b/shop/app/my-customers/[id]/page.tsx
index a6702d0..0f6c15a 100644
--- a/shop/app/my-customers/[id]/page.tsx
+++ b/shop/app/my-customers/[id]/page.tsx
@@ -104,6 +104,13 @@ export default function CustomerDetailPage({ params }: { params: Promise<{ id: s
               Kunden-ID: <span className="font-mono">{customer.id.slice(0, 8)}…</span>
             </p>
           </div>
+          {!customer.is_anonymized && (
+            <Link href={`/order?customer_id=${customer.id}`} className="ml-auto">
+              <Button size="sm" className="bg-primary hover:bg-primary/90 text-white font-bold gap-2 shadow-[0_0_15px_rgba(59,130,246,0.3)] text-xs">
+                <ShoppingBag className="w-4 h-4" /> Kunde updaten / bestellen
+              </Button>
+            </Link>
+          )}
           {customer.is_anonymized && (
             <Badge className="bg-red-500/10 text-red-400 border-red-500/20 gap-1 ml-auto">
               <AlertTriangle className="w-3 h-3" /> Anonymisiert
diff --git a/shop/app/order/page.tsx b/shop/app/order/page.tsx
index 3a6dd3c..47e0233 100644
--- a/shop/app/order/page.tsx
+++ b/shop/app/order/page.tsx
@@ -138,6 +138,10 @@ async function OrderDataWrapper({
     companies = await getCompanies().catch(() => [])
   }
 
+  const initialLastLicenseDate = initialOrder
+    ? (initialOrder.order_data?.last_license_date || (initialOrder.created_at ? new Date(initialOrder.created_at).toISOString().split('T')[0] : ''))
+    : ''
+
   return (
     <OrderWizard
       products={products}
@@ -150,6 +154,7 @@ async function OrderDataWrapper({
       upgradeMode={mode === 'upgrade'}
       initialEndCustomerId={customerId || null}
       lockedDeviceId={deviceId ? decodeURIComponent(deviceId) : null}
+      initialLastLicenseDate={initialLastLicenseDate}
     />
   )
 }
diff --git a/shop/components/customer-accordion-list.tsx b/shop/components/customer-accordion-list.tsx
index ec52468..bdbce0a 100644
--- a/shop/components/customer-accordion-list.tsx
+++ b/shop/components/customer-accordion-list.tsx
@@ -120,14 +120,15 @@ function DeviceCard({
           </p>
         </div>
 
-        {/* Upgrade / Abo Button */}
+        {/* Update / Upgrade Button für Kasse */}
         <Link href={upgradeUrl}>
           <Button
             size="sm"
-            className="bg-primary/20 hover:bg-primary/30 text-primary border border-primary/30 text-xs font-semibold gap-1.5"
+            className="bg-sky-500/20 hover:bg-sky-500/30 text-sky-300 border border-sky-500/40 text-xs font-bold gap-1.5 shadow-[0_0_12px_rgba(56,189,248,0.2)]"
+            title="Kasse updaten oder upgraden (Erstelldatum wird für den Update-Rabatt genutzt)"
           >
-            <Sparkles className="w-3.5 h-3.5" />
-            Upgrade / Abo
+            <Sparkles className="w-3.5 h-3.5 text-sky-400" />
+            Update / Upgrade
           </Button>
         </Link>
 
@@ -272,18 +273,31 @@ export function CustomerAccordionList({ customers }: CustomerAccordionListProps)
                   </Badge>
 
                   {!customer.is_anonymized && (
-                    <Link
-                      href={`/my-customers/${customer.id}`}
-                      onClick={(e) => e.stopPropagation()}
-                    >
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        className="text-slate-400 hover:text-white hover:bg-white/10 gap-1 text-xs"
+                    <>
+                      <Link
+                        href={`/order?customer_id=${customer.id}`}
+                        onClick={(e) => e.stopPropagation()}
                       >
-                        <Edit2 className="w-3.5 h-3.5" /> Bearbeiten
-                      </Button>
-                    </Link>
+                        <Button
+                          size="sm"
+                          className="bg-primary/20 hover:bg-primary/30 text-primary border border-primary/40 gap-1.5 text-xs font-bold shadow-[0_0_10px_rgba(59,130,246,0.2)]"
+                        >
+                          <Sparkles className="w-3.5 h-3.5" /> Kunde updaten / bestellen
+                        </Button>
+                      </Link>
+                      <Link
+                        href={`/my-customers/${customer.id}`}
+                        onClick={(e) => e.stopPropagation()}
+                      >
+                        <Button
+                          variant="ghost"
+                          size="sm"
+                          className="text-slate-400 hover:text-white hover:bg-white/10 gap-1 text-xs"
+                        >
+                          <Edit2 className="w-3.5 h-3.5" /> Bearbeiten
+                        </Button>
+                      </Link>
+                    </>
                   )}
 
                   <Button
diff --git a/shop/components/order-wizard.tsx b/shop/components/order-wizard.tsx
index 78d37d8..fab3f88 100644
--- a/shop/components/order-wizard.tsx
+++ b/shop/components/order-wizard.tsx
@@ -90,6 +90,7 @@ export function OrderWizard({
   upgradeMode?: boolean
   initialEndCustomerId?: string | null
   lockedDeviceId?: string | null
+  initialLastLicenseDate?: string
 }) {
   const router = useRouter()
   // Upgrade-Mode: starte direkt bei Schritt 3 (Software)
@@ -214,7 +215,7 @@ export function OrderWizard({
 
   // Falls "one_time" (Kauf) gewählt: optionales Datum der letzten CASPOS-Lizenzierung
   const [lastLicenseDate, setLastLicenseDate] = useState<string>(
-    initialOrder?.order_data?.last_license_date || ''
+    initialLastLicenseDate || initialOrder?.order_data?.last_license_date || ''
   )
 
   // Aktive Auswahllisten initialisieren