diff --git a/WORKSPACE b/WORKSPACE
index d3755c02..a2125c88 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2090,3 +2090,8 @@ go_repository(
     commit = "06500030e7d26826f68caa5ca7d98c315c4caa28",
     importpath = "github.com/gabriel-vasile/mimetype",
 )
+go_repository(
+    name = "com_github_kevinburke_go_bindata",
+    commit = "a606d617e1d1546a2342de6fc4ed95c78e171d68",
+    importpath = "github.com/kevinburke/go-bindata",
+)
diff --git a/bgpwtf/invoice/templates/invoice_en.html b/bgpwtf/invoice/templates/invoice_en.html
index d661732d..6a92022a 100644
--- a/bgpwtf/invoice/templates/invoice_en.html
+++ b/bgpwtf/invoice/templates/invoice_en.html
@@ -142,7 +142,7 @@ div.bgtext div {
                     {{ if .USCustomer }}
                     <li>EIN: {{ .InvoiceeVAT }}</li>
                     <li><b>(VAT zero rate)</b></li>
-                    {{ else }}
+                    {{ else if .InvoiceeVAT }}
                     <li><b>NIP:</b> {{ .InvoiceeVAT }}</li>
                     {{ end }}
 
diff --git a/bgpwtf/invoice/templates/invoice_pl.html b/bgpwtf/invoice/templates/invoice_pl.html
index df49da85..15f5d084 100644
--- a/bgpwtf/invoice/templates/invoice_pl.html
+++ b/bgpwtf/invoice/templates/invoice_pl.html
@@ -143,7 +143,7 @@ div.bgtext div {
                     {{ if .USCustomer }}
                     <li>EIN: {{ .InvoiceeVAT }}</li>
                     <li><b>(VAT zero rate)</b></li>
-                    {{ else }}
+                    {{ else if .InvoiceeVAT }}
                     <li><b>NIP:</b> {{ .InvoiceeVAT }}</li>
                     {{ end }}