diff --git a/app/ui/ViewLocationCard.tsx b/app/ui/ViewLocationCard.tsx
index b006b32..0280ccb 100644
--- a/app/ui/ViewLocationCard.tsx
+++ b/app/ui/ViewLocationCard.tsx
@@ -16,7 +16,7 @@ export interface ViewLocationCardProps {
 
 export const ViewLocationCard:FC<ViewLocationCardProps> = ({location, userSettings}) => {
 
-    const { _id, name: locationName, yearMonth, bills, tenantName, tenantStreet, tenantTown } = location;
+    const { _id, name: locationName, yearMonth, bills, tenantName, tenantStreet, tenantTown, generateTenantCode } = location;
 
     const t = useTranslations("home-page.location-card");
 
@@ -56,19 +56,25 @@ export const ViewLocationCard:FC<ViewLocationCardProps> = ({location, userSettin
                     </p>
                     : null
                 }
-                <p className="max-w-[25em] ml-1 mt-1 mb-1">{t("payment-info-header")}</p>
-                <ul className="ml-4 mb-3">
-                    <li><strong>{t("payment-iban-label")}</strong><pre className="inline pl-1">{paymentParams.IBAN}</pre></li>
-                    <li><strong>{t("payment-recipient-label")}</strong> <pre className="inline pl-1">{paymentParams.Primatelj}</pre></li>
-                    <li><strong>{t("payment-recipient-address-label")}</strong><pre className="inline pl-1">{paymentParams.AdresaPrimatelja}</pre></li>
-                    <li><strong>{t("payment-recipient-city-label")}</strong><pre className="inline pl-1">{paymentParams.SjedistePrimatelja}</pre></li>
-                    <li><strong>{t("payment-amount-label")}</strong> <pre className="inline pl-1">{paymentParams.Iznos}</pre></li>
-                    <li><strong>{t("payment-description-label")}</strong><pre className="inline pl-1">{paymentParams.OpisPlacanja}</pre></li>
-                    <li><strong>{t("payment-model-label")}</strong><pre className="inline pl-1">{paymentParams.ModelPlacanja}</pre></li>
-                    <li><strong>{t("payment-reference-label")}</strong><pre className="inline pl-1">{paymentParams.PozivNaBroj}</pre></li>
-                    <li><strong>{t("payment-purpose-code-label")}</strong><pre className="inline pl-1">{paymentParams.SifraNamjene}</pre></li>
-                </ul>
-                <Pdf417Barcode paymentParams={paymentParams} />
+                {
+                    userSettings?.show2dCodeInMonthlyStatement && generateTenantCode ?
+                    <>
+                        <p className="max-w-[25em] ml-1 mt-1 mb-1">{t("payment-info-header")}</p>
+                        <ul className="ml-4 mb-3">
+                            <li><strong>{t("payment-iban-label")}</strong><pre className="inline pl-1">{paymentParams.IBAN}</pre></li>
+                            <li><strong>{t("payment-recipient-label")}</strong> <pre className="inline pl-1">{paymentParams.Primatelj}</pre></li>
+                            <li><strong>{t("payment-recipient-address-label")}</strong><pre className="inline pl-1">{paymentParams.AdresaPrimatelja}</pre></li>
+                            <li><strong>{t("payment-recipient-city-label")}</strong><pre className="inline pl-1">{paymentParams.SjedistePrimatelja}</pre></li>
+                            <li><strong>{t("payment-amount-label")}</strong> <pre className="inline pl-1">{paymentParams.Iznos}</pre></li>
+                            <li><strong>{t("payment-description-label")}</strong><pre className="inline pl-1">{paymentParams.OpisPlacanja}</pre></li>
+                            <li><strong>{t("payment-model-label")}</strong><pre className="inline pl-1">{paymentParams.ModelPlacanja}</pre></li>
+                            <li><strong>{t("payment-reference-label")}</strong><pre className="inline pl-1">{paymentParams.PozivNaBroj}</pre></li>
+                            <li><strong>{t("payment-purpose-code-label")}</strong><pre className="inline pl-1">{paymentParams.SifraNamjene}</pre></li>
+                        </ul>
+                        <Pdf417Barcode paymentParams={paymentParams} />
+                    </>
+                    : null
+                }
             </div>
         </div>);
 };
\ No newline at end of file