diff --git a/pages/createDocument/edit/[[id]].vue b/pages/createDocument/edit/[[id]].vue
index 4774ef9..16444b8 100644
--- a/pages/createDocument/edit/[[id]].vue
+++ b/pages/createDocument/edit/[[id]].vue
@@ -649,8 +649,8 @@ const getDocumentData = () => {
 
   const generateContext = (itemInfo, contactData) => {
     return {
-      vorname:contactData && contactData.firstName,
-      nachname: contactData && contactData.lastName,
+      vorname:(contactData && contactData.firstName) || (customerData && customerData.firstname),
+      nachname: (contactData && contactData.lastName) || (customerData && customerData.lastname),
       kundenname: customerData && customerData.name,
       zahlungsziel_in_tagen:itemInfo.paymentDays,
       diesel_gesamtverbrauch: (itemInfo.agriculture && itemInfo.agriculture.dieselUsageTotal) && itemInfo.agriculture.dieselUsageTotal
@@ -1003,7 +1003,7 @@ const setRowData = (row) => {
           >
             <template #description>
               <ul class="list-disc ml-5">
-                <li v-for="error in findDocumentErrors" :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['text-white']]">
+                <li v-for="error in findDocumentErrors" :class="[...error.type === 'breaking' ? ['text-rose-600'] : ['dark:text-white','text-black']]">
                   {{error.message}}
                 </li>
               </ul>
diff --git a/stores/data.js b/stores/data.js
index 1f1190f..c1365f8 100644
--- a/stores/data.js
+++ b/stores/data.js
@@ -156,9 +156,42 @@ export const useDataStore = defineStore('data', () => {
                     inputType: "text"
                 }, {
                     key: "name",
-                    label: "Name",
+                    label: "Firmenname",
                     title: true,
-                    inputType: "text"
+                    inputType: "text",
+                    disabledFunction: function (item) {
+                        return !item.isCompany
+                    },
+                },{
+                    key: "firstname",
+                    label: "Vorname",//TODO: Add Conditional Rendering to Datatypes
+                    title: true,
+                    inputType: "text",
+                    inputChangeFunction: function (row) {
+                        if(row.firstname && row.lastname) {
+                            row.name = `${row.firstname} ${row.lastname}`
+                        } else {
+                            row.name = row.firstname
+                        }
+                    },
+                    disabledFunction: function (item) {
+                        return item.isCompany
+                    },
+                },{
+                    key: "lastname",
+                    label: "Nachname",
+                    title: true,
+                    inputType: "text",
+                    inputChangeFunction: function (row) {
+                        if(row.firstname && row.lastname) {
+                            row.name = `${row.firstname} ${row.lastname}`
+                        } else {
+                            row.name = row.lastname
+                        }
+                    },
+                    disabledFunction: function (item) {
+                        return item.isCompany
+                    },
                 }, {
                     key: "isCompany",
                     label: "Firmenkunde",