diff --git a/resources/assets/js/components/order-processing/customers/CustomerEdit.vue b/resources/assets/js/components/order-processing/customers/CustomerEdit.vue
index 87e0241e..1006559a 100644
--- a/resources/assets/js/components/order-processing/customers/CustomerEdit.vue
+++ b/resources/assets/js/components/order-processing/customers/CustomerEdit.vue
@@ -44,7 +44,10 @@
       mounted() {
           Dispatcher.add('save-customer', this);
       },
-      methods: {
+      methods: { 
+          displayName() {
+             return !this.customer.details.data.firstname && !this.customer.details.data.lastname ? '[No Name]' : this.customer.details.data.firstname?this.customer.details.data.firstname:'' + ' ' + this.customer.details.data.lastname?this.customer.details.data.lastname:''
+          },
           formatLabel(value) {
               value = value.split('_').join(' ').toString();
               return value.charAt(0).toUpperCase() + value.slice(1);
@@ -92,7 +95,7 @@
                   });
 
                   CandyEvent.$emit('title-changed', {
-                      title: this.customer.details.data.firstname + ' ' + this.customer.details.data.lastname
+                      title: this.displayName()
                   });
 
                   let chunkedOrders = _.chunk(this.customer.orders.data, this.ordersPerPage);
@@ -102,9 +105,7 @@
                   });
 
                   document.title = 'Editing ' +
-                    this.customer.details.data.firstname +
-                    ' ' +
-                    this.customer.details.data.lastname +
+                    this.displayName() +
                     ' - GetCandy';
 
                   apiRequest.send('GET', 'currencies').then(response => {