diff --git a/00-backend/datasource/database.sqlite b/00-backend/datasource/database.sqlite
index 0f14074..c62d824 100644
Binary files a/00-backend/datasource/database.sqlite and b/00-backend/datasource/database.sqlite differ
diff --git a/01-frontend/public/locales/de/translation.json b/01-frontend/public/locales/de/translation.json
index f090ece..54f67c2 100644
--- a/01-frontend/public/locales/de/translation.json
+++ b/01-frontend/public/locales/de/translation.json
@@ -95,5 +95,6 @@
   "telephone": "Telefon",
   "basketEmpty": "Der Warenkorb ist leer.",
   "login": "Anmelden",
-  "total": "Insgesamt"
+  "total": "Insgesamt",
+  "admin": "Admin"
 }
diff --git a/01-frontend/public/locales/en/translation.json b/01-frontend/public/locales/en/translation.json
index 06f0274..7295bdb 100644
--- a/01-frontend/public/locales/en/translation.json
+++ b/01-frontend/public/locales/en/translation.json
@@ -95,5 +95,6 @@
   "telephone": "Telephone",
   "basketEmpty": "The shopping cart is empty.",
   "login": "Login",
-  "total": "Total"
-}
+  "total": "Total",
+  "admin": "Admin"
+}
\ No newline at end of file
diff --git a/01-frontend/src/pages/Payment.tsx b/01-frontend/src/pages/Payment.tsx
index 03a10fb..3ca2c82 100644
--- a/01-frontend/src/pages/Payment.tsx
+++ b/01-frontend/src/pages/Payment.tsx
@@ -117,8 +117,16 @@ export default function Payment() {
         </Alert>
     };
 
+    const { refetch: refetchSubmit, isError: orderIsError } = useQuery({
+                queryKey: ["submitOrder", submitOrderData],
+                queryFn: () => submitOrder(submitOrderData),
+                retry: 0,
+                retryDelay: 1000,
+                enabled: false,
+            });
+
     const handleNext = async () => {
-        var next: boolean = true;
+        let next: boolean = true;
 
         if (activeStep === steps.length - 2) {
             // Simulate order placement and generate order number
@@ -130,13 +138,7 @@ export default function Payment() {
                 console.log(await (await refetchCustomer()).data.id);
                 submitOrderData.customerId = await (await refetchCustomer()).data.id; // Get the customer ID from the response
             }
-            const { refetch: refetchSubmit, isError: orderIsError } = useQuery({
-                queryKey: ["submitOrder", submitOrderData],
-                queryFn: () => submitOrder(submitOrderData),
-                retry: 0,
-                retryDelay: 1000,
-                enabled: false,
-            });
+
             void refetchSubmit(); // Submit order data
             if(orderIsError) {
                 next = false