diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index 00e95c7..92116a4 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -134,7 +134,9 @@
 					<div style="height: 10px;
 								margin-top: 10px;">
 					</div>			
-					<mat-form-field  class="settings-field" [style.width.%]="100">
+					<mat-form-field  *ngIf="linked2Xero"
+									 class="settings-field"
+					                 [style.width.%]="100">
 						<mat-label>Account Code</mat-label>
 						<input matInput 
 							   width="100%"
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
index 08bf988..ab8aaae 100644
--- a/src/app/settings/settings.component.ts
+++ b/src/app/settings/settings.component.ts
@@ -126,7 +126,7 @@ export class SettingsComponent implements OnInit {
 	}
 
 	closeIntegration() {
-		if ( this.xeroAccCod == '' ) 
+		if ( (this.xeroAccCod == '') && (this.linked2Xero) ) 
 			this.notifierService
 		    .showNotification("Payment confirmation disabled!!","Close",'warning');
 		this.dialogRef.close();