diff --git a/client/src/components/modals/PayForAllModal.tsx b/client/src/components/modals/PayForAllModal.tsx
index 29e7d78..f437625 100644
--- a/client/src/components/modals/PayForAllModal.tsx
+++ b/client/src/components/modals/PayForAllModal.tsx
@@ -84,13 +84,13 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
         if (includedDiners.length === 0) return 0;
         const tip = parseAmount(tipTotal);
         if (tip === null || tip === 0) return 0;
-        return Math.round((tip / includedDiners.length) * 100) / 100;
+        const totalPeople = includedDiners.length + 1; // +1 for payer
+        return Math.round((tip / totalPeople) * 100) / 100;
     })();
 
     const getTotal = (d: DinerEntry): number => {
         const surcharge = parseAmount(d.surchargeAmount) ?? 0;
-        const tip = d.included && d.login !== payerLogin ? tipPerPerson : 0;
-        return Math.round((d.baseAmount + surcharge + tip) * 100) / 100;
+        return Math.round((d.baseAmount + surcharge + tipPerPerson) * 100) / 100;
     };
 
     const handleInclude = useCallback((login: string, checked: boolean) => {
@@ -167,7 +167,7 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
                     </Alert>
                 ) : (
                     <>
-                        <p>Zaplatili jste za skupinu v restauraci. Nastavte příplatky a dýško, poté vygenerujte QR kódy pro ostatní.</p>
+                        <p>Zaplatili jste za skupinu v restauraci. Nastavte příplatky a společné poplatky, poté vygenerujte QR kódy pro ostatní.</p>
 
                         {!hasMenu && (
                             <Alert variant="info">
@@ -194,7 +194,7 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
                                     <th>Strávník</th>
                                     <th>Jídla</th>
                                     <th style={{ width: 220 }}>Příplatek</th>
-                                    <th style={{ width: 90 }}>Dýško</th>
+                                    <th style={{ width: 90 }}>Poplatek</th>
                                     <th style={{ width: 90 }}>Celkem</th>
                                 </tr>
                             </thead>
@@ -248,7 +248,7 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
                                                 </div>
                                             </td>
                                             <td className="text-end">
-                                                {!isPayer && d.included ? `${tipPerPerson} Kč` : '—'}
+                                                {tipPerPerson > 0 ? `${tipPerPerson} Kč` : '—'}
                                             </td>
                                             <td className="text-end fw-bold">
                                                 {`${total} Kč`}
@@ -260,7 +260,7 @@ export default function PayForAllModal({ isOpen, onClose, locationName, location
                         </Table>
 
                         <div className="d-flex align-items-center gap-2 mt-2">
-                            <label className="mb-0 text-nowrap">Dýško celkem (Kč):</label>
+                            <label className="mb-0 text-nowrap">Poplatky celkem (Kč):</label>
                             <Form.Control
                                 type="text"
                                 placeholder="0"
diff --git a/client/src/components/modals/PayForGroupModal.tsx b/client/src/components/modals/PayForGroupModal.tsx
index 9d8db2d..3e5a1e9 100644
--- a/client/src/components/modals/PayForGroupModal.tsx
+++ b/client/src/components/modals/PayForGroupModal.tsx
@@ -60,13 +60,13 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
         if (includedNonPayers.length === 0) return 0;
         const tip = parseAmount(tipTotal);
         if (tip === null || tip === 0) return 0;
-        return Math.round((tip / includedNonPayers.length) * 100) / 100;
+        const totalPeople = includedNonPayers.length + 1; // +1 for payer
+        return Math.round((tip / totalPeople) * 100) / 100;
     })();
 
     const getTotal = (d: DinerEntry): number => {
         const surcharge = parseAmount(d.surchargeAmount) ?? 0;
-        const tip = d.included && d.login !== payerLogin ? tipPerPerson : 0;
-        return Math.round((d.baseAmount + surcharge + tip) * 100) / 100;
+        return Math.round((d.baseAmount + surcharge + tipPerPerson) * 100) / 100;
     };
 
     const handleInclude = useCallback((login: string, checked: boolean) => {
@@ -139,7 +139,7 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
                     </Alert>
                 ) : (
                     <>
-                        <p>Zaplatili jste za skupinu. Nastavte příplatky a dýško, poté vygenerujte QR kódy pro ostatní.</p>
+                        <p>Zaplatili jste za skupinu. Nastavte příplatky a společné poplatky, poté vygenerujte QR kódy pro ostatní.</p>
 
                         {error && (
                             <Alert variant="danger" onClose={() => setError(null)} dismissible>
@@ -154,7 +154,7 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
                                     <th>Člen</th>
                                     <th style={{ width: 90 }}>Základ (Kč)</th>
                                     <th style={{ width: 220 }}>Příplatek</th>
-                                    <th style={{ width: 90 }}>Dýško</th>
+                                    <th style={{ width: 90 }}>Poplatek</th>
                                     <th style={{ width: 90 }}>Celkem</th>
                                 </tr>
                             </thead>
@@ -203,7 +203,7 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
                                                 </div>
                                             </td>
                                             <td className="text-end">
-                                                {!isPayer && d.included ? `${tipPerPerson} Kč` : '—'}
+                                                {tipPerPerson > 0 ? `${tipPerPerson} Kč` : '—'}
                                             </td>
                                             <td className="text-end fw-bold">
                                                 {`${total} Kč`}
@@ -215,7 +215,7 @@ export default function PayForGroupModal({ isOpen, onClose, group, payerLogin, b
                         </Table>
 
                         <div className="d-flex align-items-center gap-2 mt-2">
-                            <label className="mb-0 text-nowrap">Dýško celkem (Kč):</label>
+                            <label className="mb-0 text-nowrap">Poplatky celkem (Kč):</label>
                             <Form.Control
                                 type="text"
                                 placeholder="0"