diff --git a/templates/invoice.tex b/templates/invoice.tex
index d03216c..40691dd 100644
--- a/templates/invoice.tex
+++ b/templates/invoice.tex
@@ -113,25 +113,26 @@ a2 += (len(a1)-len(a2))*[""]
 
 % COMPANY ID NUMBERS
 \multicolumn{2}{X|}{} & \multicolumn{2}{X}{} \\
-    % ISSUER
+    % ICO
     \multicolumn{2}{l|}{IČO: {{issuer.ico}}} &
         \multicolumn{2}{l}{ {{if customer.ico}}IČO: \hspace{0.3cm}{{customer.ico}}{{endif}} } \\
-    % CUSTOMER
+    % DIC
     \multicolumn{2}{l|}{DIČ: {{issuer.dic}}} &
         \multicolumn{2}{l}{ {{if customer.dic}}DIČ: \hspace{0.3cm}{{customer.dic}}{{endif}} } \\
-{{if issuer.icdph or customer.icdph}}
+
+    % ICDPH ISSUER
     {{if issuer.icdph}}
     \multicolumn{2}{l|}{IČDPH: {{issuer.icdph}}} &
     {{else}}
     \multicolumn{2}{l|}{Neplatca DPH} &
     {{endif}}
+
+    % ICDPH CUSTOMER
     {{if customer.icdph}}
     \multicolumn{2}{l}{IČDPH: {{customer.icdph}}} \\
     {{else}}
     \multicolumn{2}{l}{} \\
     {{endif}}
-{{endif}}
-
 \multicolumn{2}{X|}{} & \multicolumn{2}{X}{} \\
 
 % COMMENTS