diff --git a/src/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobilePopupAddCustomer.vue b/src/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobilePopupAddCustomer.vue
index 6ea6ec0e..d6593758 100644
--- a/src/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobilePopupAddCustomer.vue
+++ b/src/components/displays/department/pos/steps/mobile/elements/PosDepartmentStepMobilePopupAddCustomer.vue
@@ -123,7 +123,10 @@ watch([cvr, companyPhone, invoiceEmail, contactEmail, contactPhone], (newValues)
     popups.get().actionButtons.splice(index, 1);
   }
   // Add the "Add Customer" button if all fields are filled
-  if (newValues.every((value) => value !== "")) {
+  const requiredFields = [cvr, companyPhone, contactPhone];
+  if (searchResult.value !== null &&
+      searchResult.value.name !== "Ikke fundet" &&
+      requiredFields.every((field) => field.value !== "")) {
     popups.get().actionButtons.push({
       label: "Tilføj kunde",
       onClick: () => {
@@ -197,14 +200,14 @@ watch([cvr, companyPhone, invoiceEmail, contactEmail, contactPhone], (newValues)
       <div class="field">
         <label class="label"><small>Faktura email</small></label>
         <div class="control">
-          <input v-model="invoiceEmail" class="input" type="text" placeholder="Faktura email" :disabled="searchResult === null" :class="{'is-danger': searchResult !== null && invoiceEmail === ''}"/>
+          <input v-model="invoiceEmail" class="input" type="text" placeholder="Faktura email" :disabled="searchResult === null"/>
         </div>
       </div>
       <!-- Contact email -->
       <div class="field">
         <label class="label"><small>Kontakt email</small></label>
         <div class="control">
-          <input v-model="contactEmail" class="input" type="text" placeholder="Kontakt email" :disabled="searchResult === null" :class="{'is-danger': searchResult !== null && contactEmail === ''}"/>
+          <input v-model="contactEmail" class="input" type="text" placeholder="Kontakt email" :disabled="searchResult === null"/>
         </div>
       </div>
       <!-- Contact phone -->