diff --git a/AyaNovaQBI/SetQBChargeAs.cs b/AyaNovaQBI/SetQBChargeAs.cs
index eaf877b..ac948cf 100644
--- a/AyaNovaQBI/SetQBChargeAs.cs
+++ b/AyaNovaQBI/SetQBChargeAs.cs
@@ -36,12 +36,15 @@ namespace AyaNovaQBI
             this.btnCancel.Text = util.AyaTranslations["Cancel"];
             this.btnOK.Text = util.AyaTranslations["OK"];
 
-          
+
 
             this.cbQBItems.DataSource = QBItems;
             this.cbQBItems.DisplayMember = "FullName";
             this.cbQBItems.ValueMember = "ID";
-            this.cbQBItems.SelectedValue = SelectedQBItem;
+            if (SelectedQBItem == "")
+                cbQBItems.SelectedIndex = 0;
+            else
+                this.cbQBItems.SelectedValue = SelectedQBItem;
 
             this.lblStatus.Text = "QuickBooks item:";
 
diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs
index 4239410..49c184f 100644
--- a/AyaNovaQBI/util.cs
+++ b/AyaNovaQBI/util.cs
@@ -1047,7 +1047,7 @@ namespace AyaNovaQBI
             #region QB  InvoiceTemplate
             //Templates are only supported in xml 3 or greater (all countries)
             //if Set everything (first run) then display a dialog about it
-            if (QVersion > 3 && SetEverything == true)
+            if (QVersion < 3 && SetEverything == true)
             {
 
                 SetInfoOnly s3a = new SetInfoOnly();