diff --git a/organizations/testowa.yaml b/organizations/testowa.yaml
index a8ac81b..739b5e1 100755
--- a/organizations/testowa.yaml
+++ b/organizations/testowa.yaml
@@ -11,8 +11,9 @@ dostawa:
   ulica: Testowa 1
   kod: 00-000
   miasto: Warszawa
-  kod_paczkomatu: WAW01M
   telefon: 22 000 00 00
+  email: kontakt@testowa.pl
+  kod_paczkomatu: WAW01M
   dodatkowe_informacje: Dostawa tylko w godzinach 9:00-17:00, proszę dzwonić przed przyjściem
 
 produkty:
diff --git a/site/templates/organization.html b/site/templates/organization.html
index 76704ed..5021b0e 100755
--- a/site/templates/organization.html
+++ b/site/templates/organization.html
@@ -101,9 +101,8 @@ <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Adres</h2>
 
         <!-- Right column: Paczkomat and Phone -->
         <div class="pb-4">
-          {% if data.dostawa.kod_paczkomatu %}
           <div class="pb-4">
-            <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Kod paczkomatu</h2>
+            <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Telefon dla kuriera</h2>
             <div
               class="copyable-field-standalone"
               role="button"
@@ -111,11 +110,32 @@ <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Kod paczkomatu</h2>
               onclick="copyText(this)"
               onkeydown="handleCopyKeydown(event, this)"
             >
-              {{ data.dostawa.kod_paczkomatu }}
+              {{ data.dostawa.telefon }}
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                stroke-width="1.5"
+                stroke="currentColor"
+                class="size-6"
+              >
+                <use href="#icon-copy"></use>
+              </svg>
+            </div>
+          </div>
+
+          <div class="pb-4">
+            <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Email dla kuriera</h2>
+            <div
+              class="copyable-field-standalone"
+              role="button"
+              tabindex="0"
+              onclick="copyText(this)"
+              onkeydown="handleCopyKeydown(event, this)"
+            >
+              {{ data.dostawa.email }}
               <svg
                 xmlns="http://www.w3.org/2000/svg"
                 fill="none"
-                viewBox="0 0 24 24"
                 stroke-width="1.5"
                 stroke="currentColor"
                 class="size-6"
@@ -124,10 +144,10 @@ <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Kod paczkomatu</h2>
               </svg>
             </div>
           </div>
-          {% endif %}
 
+          {% if data.dostawa.kod_paczkomatu %}
           <div>
-            <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Telefon dla kuriera</h2>
+            <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Kod paczkomatu</h2>
             <div
               class="copyable-field-standalone"
               role="button"
@@ -135,10 +155,11 @@ <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Telefon dla kuriera</h2>
               onclick="copyText(this)"
               onkeydown="handleCopyKeydown(event, this)"
             >
-              {{ data.dostawa.telefon }}
+              {{ data.dostawa.kod_paczkomatu }}
               <svg
                 xmlns="http://www.w3.org/2000/svg"
                 fill="none"
+                viewBox="0 0 24 24"
                 stroke-width="1.5"
                 stroke="currentColor"
                 class="size-6"
@@ -147,6 +168,7 @@ <h2 class="text-sectionTitle mb-2 pl-1 text-lg">Telefon dla kuriera</h2>
               </svg>
             </div>
           </div>
+          {% endif %}
         </div>
       </div>