diff --git a/src/app/invoice/invoice.component.ts b/src/app/invoice/invoice.component.ts
index a3fffe4..09daae6 100644
--- a/src/app/invoice/invoice.component.ts
+++ b/src/app/invoice/invoice.component.ts
@@ -104,7 +104,12 @@ export class InvoiceComponent implements OnInit {
 		receiptService.getOrderById(this.orderId!).subscribe(response => {
 			if (response.status == 200){
 				this.error = false;
-				this.codeString = `zcash:${response.body!.order.address}?amount=${response.body!.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId!)))}`; 
+				if( response.body!.order.session.substring(0,1) == 'X') {
+					this.invString = response.body!.order.externalInvoice;
+					this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId!).concat(" Invoice: ").concat(this.invString)))}`; 
+				} else {
+					this.codeString = `zcash:${response.body!.order.address}?amount=${response.body!.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId!)))}`; 
+				}
 				var qrcode = new QRCode(document.getElementById("payment-qr"), {
 					text: this.codeString,
 					logo: "/assets/zcash.png",
@@ -125,10 +130,6 @@ export class InvoiceComponent implements OnInit {
 			if ( order.session.substring(0,1) == 'W') {
 				this.isWCOrder = true;
 			}
-			if( order.session.substring(0,1) == 'X') {
-				this.invString = order.externalInvoice;
-			}
-			this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId!).concat(" Invoice: ").concat(this.invString)))}`; 
 			this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
 		});
 		this.nameUpdate.subscribe(name => {
diff --git a/src/app/pmtservice/pmtservice.component.ts b/src/app/pmtservice/pmtservice.component.ts
index f39f033..7a4661d 100644
--- a/src/app/pmtservice/pmtservice.component.ts
+++ b/src/app/pmtservice/pmtservice.component.ts
@@ -347,7 +347,7 @@ vE = {
 
 //         console.log('Generating QRCode....')
 
-         this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId)))}`; 
+         this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId).concat(' Invoice: ').concat(orderData.order.externalInvoice)))}`; 
 
          var qrcode = new QRCode(document.getElementById("payment-qr"), {
            text: this.codeString,
@@ -359,7 +359,6 @@ vE = {
            correctLevel: QRCode.CorrectLevel.H
          });
 
-         this.codeString = `zcash:${this.order.address}?amount=${this.order.totalZec.toFixed(8)}&memo=${URLSafeBase64.encode(Buffer.from('ZGo Order::'.concat(this.orderId)))}`; 
          this.zcashUrl = this.sanitizer.bypassSecurityTrustUrl(this.codeString);
       }, error => {
          console.log(error.message);