diff --git a/locale/cs_CZ/LC_MESSAGES/mail-hosting.po b/locale/cs_CZ/LC_MESSAGES/mail-hosting.po
index ea11038..00508c6 100644
--- a/locale/cs_CZ/LC_MESSAGES/mail-hosting.po
+++ b/locale/cs_CZ/LC_MESSAGES/mail-hosting.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:41+0200\n"
 "PO-Revision-Date: 2023-11-21 23:40+0000\n"
 "Last-Translator: Dai Duong Le <daiduonglebusiness@gmail.com>\n"
-"Language-Team: Czech <https://weblate.danwin1210.de/projects/DanWin/"
-"mail-hosting/cs/>\n"
+"Language-Team: Czech <https://weblate.danwin1210.de/projects/DanWin/mail-"
+"hosting/cs/>\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,25 +26,36 @@ msgid ""
 "deleting it."
 msgstr "Zdá se, že %s nemá žádné účty, ale má adresář. Zvažte jeho smazání."
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr "Odstraněno: %s"
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr "Soubor nalezen v umístění adresáře pošty: \"%s\". Zvažte jeho smazání."
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, fuzzy, php-format
+#| msgid ""
+#| "%s does not seem to have any accounts, but has a directory. Consider "
+#| "deleting it."
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr "Zdá se, že %s nemá žádné účty, ale má adresář. Zvažte jeho smazání."
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr "Žádné připojení k databázi MySQL!"
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Přepiš:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
@@ -53,11 +64,11 @@ msgstr ""
 "Jejda, e-mail „%s“ nevypadá jako platná e-mailová adresa, a proto nebyl "
 "přidán do seznamu pro přeposílání."
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr "Nemáš oprávnění spravovat tuto doménu."
 
-#: common_config.php:298
+#: common_config.php:338
 #, fuzzy
 #| msgid "Invalid email address."
 msgid "Invalid email address."
@@ -88,6 +99,10 @@ msgstr "Databáze byla úspěšně nastavena."
 msgid "Error setting up database:"
 msgstr "Chyba při nastavování databáze:"
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 #, fuzzy
 #| msgid "E-Mail and XMPP - Register"
@@ -114,12 +129,12 @@ msgstr "Registrovat"
 msgid "Manage account"
 msgstr "Spravovat účet"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -170,34 +185,34 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr ""
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
-"you can %s, and I will increase it for free."
+"Your email account has %1$s of disk space by default. If you need more, you "
+"can %2$s, and I will increase it for free."
 msgstr ""
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr ""
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
 "available per user."
 msgstr ""
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -223,7 +238,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr "Neplatné uživatelské jméno. Nesmí obsahovat +, ', \" nebo /."
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Hesla jsou prázdná nebo se neshodují"
 
@@ -239,11 +254,11 @@ msgstr "Zadaná e-mailová adresa není platná"
 msgid "The username you specified is reserved"
 msgstr "Zadané uživatelské jméno je rezervováno"
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Omlouvám se, tento uživatel již existuje"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr "Nová poštovní schránka byla úspěšně vytvořena!"
 
@@ -258,19 +273,19 @@ msgstr ""
 "Zaregistruj se a získejte bezplatnou a anonymní e-mailovou adresu a účet "
 "XMPP/Jabber"
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Uživatelské jméno"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
-#: www/admin.php:1025
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Heslo"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Heslo znovu"
 
@@ -306,21 +321,26 @@ msgstr ""
 "stejných údajů. Tvoje Jabber ID je user@%1$s a lze se k němu připojit přímo "
 "z clearnetu nebo přes skrytou službu Tor (%2$s)."
 
-#: www/index.php:25
+#: www/index.php:26
 #, fuzzy, php-format
 #| msgid ""
 #| "You will have 50MB of disk space available for your mails. If you need "
 #| "more space, just <a href=\"%1$s\">contact me</a>. Your E-Mail address "
 #| "will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"You will have %1$s disk space available for your mails. If you need more "
+"space, %2$s."
 msgstr ""
 "Pro tvoje e-maily budeš mít k dispozici 50 MB místa na disku. Pokud "
 "potřebuješ více místa, <a href=\"%1$s\">kontaktuj mě</a>. Tvoje e-mailová "
 "adresa bude %2$s"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be %s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -329,17 +349,17 @@ msgid ""
 "to make use of WKD automatic discovery for mail clients."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 #, fuzzy
 #| msgid "Edit account"
 msgid "add it to your account"
 msgstr "Upravit účet"
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -355,30 +375,30 @@ msgid ""
 "favourite desktop mail client and configure it with the settings given below."
 msgstr ""
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "Nastavení e-mailu"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) nebo 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) nebo 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) nebo 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Autentizace: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -387,26 +407,26 @@ msgstr ""
 "Můžeš se také připojit na stejné porty přes adresu Tor onion %s, ale budeš "
 "muset přijmout certifikát SSL platný pouze pro doménu clearnet."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "Nastavení XMPP"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Doména: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr "Připojit server: %s (volitelné pro torifikaci)"
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr "Proxy přenosu souborů: %s"
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -436,7 +456,7 @@ msgstr "Neplatné uživatelské jméno"
 msgid "Incorrect username or password"
 msgstr "Nesprávné uživatelské jméno nebo heslo"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Heslo bylo úspěšně aktualizováno"
 
@@ -544,16 +564,16 @@ msgstr "2FA kód"
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "Přihlášen jako %s"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Odhlásit"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Přihlásit se"
 
@@ -575,11 +595,11 @@ msgstr ""
 "řádek nebo oddělené čárkami. Když zaškrtneš políčko „uchovat místní kopii“, "
 "tvoje pošta bude zasílána pouze na tvé přesměrovací adresy."
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "Předat na"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr "Ponechte si místní kopii"
 
@@ -601,11 +621,11 @@ msgstr ""
 "požádat svého korespondenta, aby od svého poskytovatele požadoval podporu "
 "šifrování pro bezpečnější internet."
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Vynutit šifrování pro příchozí poštu"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Vynutit šifrování pro odchozí poštu"
 
@@ -613,8 +633,8 @@ msgstr "Vynutit šifrování pro odchozí poštu"
 msgid "Update settings"
 msgstr "Aktualizovat nastavení"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
-#: www/admin.php:1036
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Změnit heslo"
 
@@ -852,49 +872,49 @@ msgstr "Alias byl úspěšně přidán."
 msgid "Successfully updated alias."
 msgstr "Alias byl úspěšně aktualizován."
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr "Poštovní schránka byla úspěšně aktualizována."
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr "Dvoufaktorové ověřování bylo úspěšně zakázáno"
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr "E-mail a XMPP - správa administrace"
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 "Umožnit vlastníkům domén spravovat jejich e-mailovou doménu a uživatelské "
 "účty."
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr "Spravovat administrátory"
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr "Spravovat alias domén"
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr "Spravovat svůj účet správce"
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr "Spravovat domény"
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr "Správa aliasů"
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr "Správa poštovních schránek"
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
@@ -902,7 +922,7 @@ msgstr ""
 "Vítejte v rozhraní pro správu správce. Zde můžete nakonfigurovat své domény "
 "a účty. Vyberte možnost z nabídky."
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
@@ -910,219 +930,219 @@ msgstr ""
 "Jejda, zdá se, že stránka, kterou jsi se pokusil otevřít, neexistuje nebo k "
 "ní nemáš oprávnění."
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr "Vytvořit nového správce"
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr "Administrátor"
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
-#: www/admin.php:1001
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
+#: www/admin.php:999
 msgid "Active"
 msgstr "Aktivní"
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
-#: www/admin.php:909
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
+#: www/admin.php:907
 msgid "Last modified"
 msgstr "Naposledy změněno"
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr "Upravit účet"
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 #, fuzzy
 #| msgid "Disable account"
 msgid "Disabled"
 msgstr "Deaktivovat účet"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
-#: www/admin.php:922
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Upravit"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr "Upravit účet správce %s"
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr "Superadmin"
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr "Superadministrátoři mohou spravovat ostatní administrátory"
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr "Spravované domény"
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr "Uložit"
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr "Smazat administrátora"
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr "Jejda, zdá se, že tento správce neexistuje."
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr "Vytvořit nový účet správce"
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr "Přidat správce"
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr "Vytvořit novou doménu"
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr "Doména"
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr "Upravit doménu"
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 #, fuzzy
 #| msgid "Delete admin"
 msgid "Deleting"
 msgstr "Smazat administrátora"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr "Přidat doménu"
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr "Upravit doménu %s"
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr "Odstranit doménu"
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr "Vytvořte nový alias domény"
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr "Alias Domény"
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr "Cílová doména"
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr "Upravit alias domény"
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr "Přidat alias domény"
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr "Upravit alias domény %s"
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr "Odstranit alias domény"
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr "Jejda, tento alias domény zřejmě neexistuje."
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr "Vytvořit nový alias"
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr "Alias"
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr "Cíl"
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr "Upravit alias"
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr "Vynutit šifrování"
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr "Přidat alias"
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr "Upravit alias %s"
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr "Odstranit alias"
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr "Jejda, zdá se, že tento alias neexistuje."
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr "Vytvořit novou poštovní schránku"
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr "Upravit poštovní schránku"
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr "Přidat poštovní schránku"
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr "Upravit poštovní schránku %s"
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr "Uložit schránku"
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr "Odstranit schránku / Zakázat dvoufaktorové ověřování"
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr "Zakázat dvoufaktorové ověřování"
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr "Jejda, zdá se, že tato poštovní schránka neexistuje."
 
@@ -1148,6 +1168,6 @@ msgstr "Jejda, zdá se, že tato poštovní schránka neexistuje."
 #~ "Pokud můžeš, použij pro ochranu soukromí šifrování pošty PGP. To brání "
 #~ "ostatním ve čtení tvých e-mailů (včetně mě a/nebo LEA). Oficiální domov "
 #~ "GnuPGs: <a href=\"https://gnupg.org\" target=\"_blank\" rel=\"noopener "
-#~ "noreferrer\">https://gnupg.org</a> GUI systému Windows: <a href="
-#~ "\"https: //gpg4usb.org\" target=\"_blank\" rel=\"noopener noreferrer"
-#~ "\">https://gpg4usb.org</a>"
+#~ "noreferrer\">https://gnupg.org</a> GUI systému Windows: <a "
+#~ "href=\"https: //gpg4usb.org\" target=\"_blank\" rel=\"noopener "
+#~ "noreferrer\">https://gpg4usb.org</a>"
diff --git a/locale/de_DE/LC_MESSAGES/mail-hosting.po b/locale/de_DE/LC_MESSAGES/mail-hosting.po
index 77dc0d2..bbbe3a2 100644
--- a/locale/de_DE/LC_MESSAGES/mail-hosting.po
+++ b/locale/de_DE/LC_MESSAGES/mail-hosting.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:41+0200\n"
 "PO-Revision-Date: 2023-11-30 17:37+0000\n"
 "Last-Translator: Weblate Admin <daniel@danwin1210.de>\n"
-"Language-Team: German <https://weblate.danwin1210.de/projects/DanWin/"
-"mail-hosting/de/>\n"
+"Language-Team: German <https://weblate.danwin1210.de/projects/DanWin/mail-"
+"hosting/de/>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,27 +28,40 @@ msgstr ""
 "%s scheint keine Konten zu haben, aber ein Verzeichnis. Denk darüber nach es "
 "zu löschen."
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr "Gelöscht: %s"
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 "Datei im Mailverzeichnis \"%s\" gefunden. Denke darüber nach diese zu "
 "löschen."
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, fuzzy, php-format
+#| msgid ""
+#| "%s does not seem to have any accounts, but has a directory. Consider "
+#| "deleting it."
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+"%s scheint keine Konten zu haben, aber ein Verzeichnis. Denk darüber nach es "
+"zu löschen."
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr "Keine Verbindung zur MySQL Datenbank!"
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Kopiere:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
@@ -57,11 +70,11 @@ msgstr ""
 "Ups, die E-Mail \"%s\" sieht nicht nach einer gültigen E-Mail Adresse aus "
 "und wurde deshalb nicht zur Weiterleitungsliste hinzugefügt."
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr "Du darfst diese Domain nicht verwalten."
 
-#: common_config.php:298
+#: common_config.php:338
 msgid "Invalid email address."
 msgstr "Ungültige E-Mail Adresse."
 
@@ -90,6 +103,10 @@ msgstr "Datenbank wurde erfolgreich erstellt."
 msgid "Error setting up database:"
 msgstr "Fehler beim Erstellen der Datenbank:"
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 msgid "E-Mail and XMPP - Terms of Service"
 msgstr "E-Mail und XMPP - Nutzungsbedingungen"
@@ -113,12 +130,12 @@ msgstr "Registrieren"
 msgid "Manage account"
 msgstr "Konto verwalten"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr "SquirrelMail"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr "SnappyMail"
@@ -181,20 +198,23 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr "Du bist für die Sicherheit deines Kontos und Passworts verantwortlich."
 
-#: www/terms.php:32
-#, php-format
+#: www/terms.php:33
+#, fuzzy, php-format
+#| msgid ""
+#| "Your email account only has 50MB of disk space by default. If you need "
+#| "more, you can %s, and I will increase it for free."
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
-"you can %s, and I will increase it for free."
+"Your email account has %1$s of disk space by default. If you need more, you "
+"can %2$s, and I will increase it for free."
 msgstr ""
 "Dein E-Mail-Konto hat standardmäßig nur 50MB Speicherplatz. Wenn du mehr "
 "benötigst, kannst du %s, und ich werde es kostenlos erhöhen."
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr "schreib mir"
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
@@ -204,20 +224,20 @@ msgstr ""
 "deine Nachrichten und Dateien für bis zu 1 Woche halten können. Bis zu 100 "
 "MB Dateispeicher ist pro Benutzer verfügbar."
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 "Ich behalte das Recht vor, dein Konto ohne vorherige Ankündigung zu "
 "blockieren oder zu löschen."
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 "Ich behalte das Recht vor, diese Bedingungen ohne vorherige Ankündigung zu "
 "ändern."
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 "Anhaltende Verstöße können die Schließung der Registrierung erforderlich "
@@ -246,7 +266,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr "Ungültiger Nutzername. Dieser darf keine +, ', \" oder / enthalten."
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Passwörter leer oder stimmen nicht überein"
 
@@ -262,11 +282,11 @@ msgstr "Deine angegebene E-Mail Adresse ist nicht gültig"
 msgid "The username you specified is reserved"
 msgstr "Dein eingegebener Nutzername ist reserviert"
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Sorry, dieser Nutzer existiert bereits"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr "Neue Mailbox erfolgreich erstellt!"
 
@@ -281,19 +301,19 @@ msgstr ""
 "Registriere dich für eine kostenloses und anonyme E-Mail Adresse und ein "
 "XMPP/Jabber Konto"
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Nutzername"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
-#: www/admin.php:1025
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Passwort"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Passwort erneut"
 
@@ -330,16 +350,24 @@ msgstr ""
 "Konto mit den gleichen Daten. Deine Jabber ID ist user@%1$s und kann direkt "
 "über Clearnet zu verbunden werden, oder über den Tor hidden service (%2$s)."
 
-#: www/index.php:25
-#, php-format
+#: www/index.php:26
+#, fuzzy, php-format
+#| msgid ""
+#| "You will have 50MB of disk space available for your mails. If you need "
+#| "more space, %1$s. Your E-Mail address will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"You will have %1$s disk space available for your mails. If you need more "
+"space, %2$s."
 msgstr ""
 "Du wirst 50MB Speicherplatz für deine E-Mails haben. Wenn du mehr Speicher "
 "brauchst, %1$s einfach. Deine E-Mail Adresse wird %2$s sein"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be %s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -353,15 +381,15 @@ msgstr ""
 "du deinen PGP-Schlüssel generiert hast, kannst du %2$s um von automatischer "
 "Erkennung in Mail-Clients über WKD Gebrauch zu machen."
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr "GnuPG herunterladen"
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "add it to your account"
 msgstr "ihn zu deinem Konto hinzufügen"
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -390,30 +418,30 @@ msgstr ""
 "vertraust. Alternativ kannst du einfach deinen Lieblings Desktop Mail-Client "
 "verwenden und mit den unten angegebenen Einstellungen konfigurieren."
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "E-Mail Einrichtung"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) oder 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) oder 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) oder 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Authentifizierung: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -423,26 +451,26 @@ msgstr ""
 "verbinden, aber du wirst ein Zertifikat akzeptieren müssen, welches nur für "
 "die Clearnet-Domain gültig ist."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "XMPP-Einrichtung"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Domain: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr "Verbindungs-Server: %s (Optional für Torifzierung)"
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr "Datentransfer-Proxy: %s"
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -472,7 +500,7 @@ msgstr "Ungültiger Nutzername"
 msgid "Incorrect username or password"
 msgstr "Ungültiger Nutzername oder Passwort"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Passwort erfolgreich aktualisiert"
 
@@ -581,16 +609,16 @@ msgstr "2FA Code"
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "Angemeldet als %s"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Abmelden"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Anmelden"
 
@@ -613,11 +641,11 @@ msgstr ""
 "\"Lokale Kopie behalten\" deaktivierst, wird deine E-Mail nur an die "
 "Weiterleitungsadressen gesendet."
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "Weiterleiten an"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr "Lokale Kopie behalten"
 
@@ -640,11 +668,11 @@ msgstr ""
 "Falle, dass sie von ihrem E-Mail Provider Unterstützung für Verschlüsselung, "
 "für ein sichereres Internet, einfordern sollen."
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Verschlüsselung für eingehende E-Mails erzwingen"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Verschlüsselung für ausgehende E-Mails erzwingen"
 
@@ -652,8 +680,8 @@ msgstr "Verschlüsselung für ausgehende E-Mails erzwingen"
 msgid "Update settings"
 msgstr "Einstellungen aktualisieren"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
-#: www/admin.php:1036
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -892,47 +920,47 @@ msgstr "Alias erfolgreich hinzugefügt."
 msgid "Successfully updated alias."
 msgstr "Alias erfolgreich aktualisiert."
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr "Mailbox erfolgreich aktualisiert."
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr "Zwei-Faktor Authentifizierung erfolgreich deaktiviert"
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr "E-Mail und XMPP - Admin Verwaltung"
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr "Lässt Domain-Inhaber ihre E-Mail Domain und Nutzer-Konten verwalten."
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr "Admins verwalten"
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr "Alias-Domains verwalten"
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr "Verwalte dein Konto"
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr "Domains verwalten"
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr "Aliase verwalten"
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr "Mailboxen verwalten"
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
@@ -940,7 +968,7 @@ msgstr ""
 "Wilkommen in der Admin-Verwaltungsoberfläche. Hier kannst du deine Domain(s) "
 "und Konten konfigurieren. Bitte wähle eine Option vom Menü."
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
@@ -948,215 +976,215 @@ msgstr ""
 "Ups, es scheint dass die Seite, auf die du versucht hast zuzugreifen "
 "entweder nicht existiert, oder du keine Berechtigung hast darauf zuzugreifen."
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr "Neuen Admin erstellen"
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr "Admin"
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
-#: www/admin.php:1001
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
+#: www/admin.php:999
 msgid "Active"
 msgstr "Aktiv"
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
-#: www/admin.php:909
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
+#: www/admin.php:907
 msgid "Last modified"
 msgstr "Zuletzt geändert"
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr "Konto bearbeiten"
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
-#: www/admin.php:922
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr "Adminkonto %s bearbeiten"
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr "Superadmin"
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr "Superadmins können andere Admins verwalten"
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr "Verwaltete Domains"
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr "Änderungen speichern"
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr "Admin löschen"
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr "Ups, dieser Admin scheint nicht zu existieren."
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr "Neues Admin-Konto erstellen"
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr "Admin hinzufügen"
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr "Neue Domain erstellen"
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr "Domain"
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr "Domain bearbeiten"
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 msgid "Deleting"
 msgstr "Wird gelöscht"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr "Domain hinzufügen"
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr "Domain %s bearbeiten"
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr "Domain löschen"
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr "Neue Alias-Domain erstellen"
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr "Alias-Domain"
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr "Ziel-Domain"
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr "Alias-Domain bearbeiten"
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr "Alias-Domain hinzufügen"
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr "Alias-Domain %s bearbeiten"
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr "Alias-Domain löschen"
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr "Ups, diese Alias-Domain schient nicht zu existieren."
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr "Neuen Alias erstellen"
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr "Alias"
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr "Ziel"
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr "Alias bearbeiten"
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr "Verschlüsselung erzwingen"
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr "Alias hinzufügen"
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr "Alias %s bearbeiten"
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr "Alias löschen"
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr "Ups, dieses Alias schient nicht zu existieren."
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr "Neue Mailbox erstellen"
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr "Mailbox bearbeiten"
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr "Wird deaktiviert"
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr "Mailbox hinzufügen"
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr "Mailbox %s bearbeiten"
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr "Mailbox speichern"
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr "Mailbox löschen / Zwei-Faktor Autorisierung deaktivieren"
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr "Zwei-Faktor Autorisierung deaktivieren"
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr "Mailbox löschen"
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr "Ups, diese Mailbox schient nicht zu existieren."
 
diff --git a/locale/pl_PL/LC_MESSAGES/mail-hosting.po b/locale/pl_PL/LC_MESSAGES/mail-hosting.po
index 4e70794..37bb410 100644
--- a/locale/pl_PL/LC_MESSAGES/mail-hosting.po
+++ b/locale/pl_PL/LC_MESSAGES/mail-hosting.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:41+0200\n"
 "PO-Revision-Date: 2023-05-01 02:04+0000\n"
 "Last-Translator: big cat <biggiecat@danwin1210.de>\n"
 "Language-Team: Polish <https://weblate.danwin1210.de/projects/DanWin/mail-"
@@ -27,36 +27,44 @@ msgid ""
 "deleting it."
 msgstr ""
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr "Usunięto: %s"
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, php-format
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr "Brak połączenia z bazą MySQL!"
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Kopiuj:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
 "wasn't added to the forwarding list."
 msgstr ""
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr ""
 
-#: common_config.php:298
+#: common_config.php:338
 #, fuzzy
 #| msgid "Invalid email address."
 msgid "Invalid email address."
@@ -87,6 +95,10 @@ msgstr ""
 msgid "Error setting up database:"
 msgstr ""
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 #, fuzzy
 #| msgid "E-Mail and XMPP - Register"
@@ -112,12 +124,12 @@ msgstr "Zarejestruj się"
 msgid "Manage account"
 msgstr "Zarządzaj kontem"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -168,34 +180,34 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr ""
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
-"you can %s, and I will increase it for free."
+"Your email account has %1$s of disk space by default. If you need more, you "
+"can %2$s, and I will increase it for free."
 msgstr ""
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr ""
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
 "available per user."
 msgstr ""
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -221,7 +233,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr "Nieprawidłowa nazwa użytkownika. Nie może zawierać + , ' , \" lub /."
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Hasła puste albo nie są takie same"
 
@@ -237,11 +249,11 @@ msgstr ""
 msgid "The username you specified is reserved"
 msgstr ""
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Ten użytkownik już istnieje"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr ""
 
@@ -254,19 +266,19 @@ msgid ""
 "Register for a free and anonymous E-Mail address and an XMPP/Jabber account"
 msgstr ""
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
-#: www/admin.php:1025
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Hasło"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Powtórz hasło"
 
@@ -302,20 +314,25 @@ msgstr ""
 "tego samego loginu i hasła. Twoje ID Jabber to user@%1$s i możesz się z nim "
 "połączyć poprzez clearnet lub Tor (%2$s)."
 
-#: www/index.php:25
+#: www/index.php:26
 #, fuzzy, php-format
 #| msgid ""
 #| "You will have 50MB of disk space available for your mails. If you need "
 #| "more space, just <a href=\"%1$s\">contact me</a>. Your E-Mail address "
 #| "will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"You will have %1$s disk space available for your mails. If you need more "
+"space, %2$s."
 msgstr ""
 "Otrzymasz 50MB miejsca na twoje maile. Jeżeli potrzebujesz więcej miejsca, "
 "<a href=\"%1$s\">skontaktuj się ze mną</a>. Twój adres E-Mail będzie na %2$s"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be %s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -324,17 +341,17 @@ msgid ""
 "to make use of WKD automatic discovery for mail clients."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 #, fuzzy
 #| msgid "Edit account"
 msgid "add it to your account"
 msgstr "Edytuj konto"
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -350,30 +367,30 @@ msgid ""
 "favourite desktop mail client and configure it with the settings given below."
 msgstr ""
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "Konfiguracja E-Mail"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) lub 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) lub 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) lub 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Uwierzytelnienie: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -382,26 +399,26 @@ msgstr ""
 "Możesz również połączyć się na tych samych portach przez Tor %s, lecz "
 "będziesz musiał zaakceptować certyfikat SSL ważny tylko dla domeny clearnet."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "Konfiguracja XMPP"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Domena: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, fuzzy, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr "Serwer połączenia: %s (opcjonalnie dla Tor)"
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr "Proxy przesyłania plików: %s"
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -430,7 +447,7 @@ msgstr "Nieprawidłowa nazwa użytkownika"
 msgid "Incorrect username or password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Pomyślnie zaktualizowano hasło"
 
@@ -535,16 +552,16 @@ msgstr "Kod 2FA"
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "Zalogowano jako %s"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -563,11 +580,11 @@ msgid ""
 "checkbox, your mail will only be sent to your forwarding addresses."
 msgstr ""
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "Przekieruj do"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr ""
 
@@ -584,11 +601,11 @@ msgid ""
 "provider for a safer internet."
 msgstr ""
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Wymuś szyfrowanie dla przychodzących maili"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Wymuś szyfrowanie dla wychodzących maili"
 
@@ -596,8 +613,8 @@ msgstr "Wymuś szyfrowanie dla wychodzących maili"
 msgid "Update settings"
 msgstr "Zaktualizuj ustawienia"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
-#: www/admin.php:1036
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Zmień hasło"
 
@@ -815,272 +832,272 @@ msgstr "Pomyślnie dodano alias."
 msgid "Successfully updated alias."
 msgstr "Pomyślnie zaktualizowano alias."
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr ""
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr "Pomyślnie wyłaczono weryfikację dwuetapową"
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr ""
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr "Zarządzaj adminami"
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr ""
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr ""
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr "Zarządzaj domenami"
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr "Zarządzaj aliasami"
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr "Zarządzaj skrzynkami"
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
 msgstr ""
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
 msgstr ""
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr "Stwórz nowego admina"
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr "Admin"
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
-#: www/admin.php:1001
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
+#: www/admin.php:999
 msgid "Active"
 msgstr "Aktywny"
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
-#: www/admin.php:909
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
+#: www/admin.php:907
 msgid "Last modified"
 msgstr "Ostatnio zmodyfikowany"
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr "Edytuj konto"
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 #, fuzzy
 #| msgid "Disable account"
 msgid "Disabled"
 msgstr "Wyłącz konto"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
-#: www/admin.php:922
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Edytuj"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr "Edytuj konto admin %s"
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr "Superadmin"
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr "Superadmini mogą zarządzać innymi adminami"
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr ""
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr "Zapisz zmiany"
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr "Usuń admina"
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr ""
 
-#: www/admin.php:602
+#: www/admin.php:600
 #, fuzzy
 msgid "Add admin"
 msgstr "Dodaj admina"
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr ""
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr "Domena"
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr "Edytuj domenę"
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 #, fuzzy
 #| msgid "Delete admin"
 msgid "Deleting"
 msgstr "Usuń admina"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr "Dodaj domenę"
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr "Edytuj domenę %s"
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr "Usuń domenę"
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr ""
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr ""
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr ""
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr ""
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr ""
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr ""
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr ""
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr "Stwórz nowy alias"
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr "Alias"
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr ""
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr "Edytuj alias"
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr ""
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr "Dodaj alias"
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr "Edytuj alias %s"
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr "Usuń alias"
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr ""
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr ""
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr ""
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr ""
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr ""
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr ""
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr ""
 
@@ -1095,6 +1112,6 @@ msgstr ""
 #~ "W ramach prywatności, używaj szyfrowania maili PGP jeżeli możesz. To "
 #~ "zapobiega odczytywaniu twoich maili przez innych (w tym mnie i/lub LEA). "
 #~ "Oficjalna strona GnuPG: <a href=\"https://gnupg.org\" target=\"_blank\" "
-#~ "rel=\"noopener noreferrer\">https://gnupg.org</a> GUI Windows: <a href="
-#~ "\"https://gpg4usb.org\" target=\"_blank\" rel=\"noopener noreferrer"
-#~ "\">https://gpg4usb.org</a>"
+#~ "rel=\"noopener noreferrer\">https://gnupg.org</a> GUI Windows: <a "
+#~ "href=\"https://gpg4usb.org\" target=\"_blank\" rel=\"noopener "
+#~ "noreferrer\">https://gpg4usb.org</a>"
diff --git a/locale/ru_RU/LC_MESSAGES/mail-hosting.po b/locale/ru_RU/LC_MESSAGES/mail-hosting.po
index 5c1eba0..675dfa3 100644
--- a/locale/ru_RU/LC_MESSAGES/mail-hosting.po
+++ b/locale/ru_RU/LC_MESSAGES/mail-hosting.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:41+0200\n"
 "PO-Revision-Date: 2023-08-14 07:26+0000\n"
 "Last-Translator: Goatli <goatli@porcod.io>\n"
 "Language-Team: Russian <https://weblate.danwin1210.de/projects/DanWin/mail-"
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.18.2\n"
 
 #: tools/delete_leftover_files.php:14
@@ -27,36 +27,44 @@ msgid ""
 "deleting it."
 msgstr ""
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr ""
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, php-format
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr ""
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Код с картинки:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
 "wasn't added to the forwarding list."
 msgstr ""
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr ""
 
-#: common_config.php:298
+#: common_config.php:338
 msgid "Invalid email address."
 msgstr ""
 
@@ -85,6 +93,10 @@ msgstr ""
 msgid "Error setting up database:"
 msgstr ""
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 #, fuzzy
 #| msgid "E-Mail and XMPP - Register"
@@ -110,12 +122,12 @@ msgstr "Регистрация"
 msgid "Manage account"
 msgstr "Настройки учетной записи"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -166,34 +178,34 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr ""
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
-"you can %s, and I will increase it for free."
+"Your email account has %1$s of disk space by default. If you need more, you "
+"can %2$s, and I will increase it for free."
 msgstr ""
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr ""
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
 "available per user."
 msgstr ""
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -219,7 +231,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr ""
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Вы не заполнили пароли или они не совпадают"
 
@@ -235,11 +247,11 @@ msgstr ""
 msgid "The username you specified is reserved"
 msgstr ""
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Такой пользователь уже есть, выберите другое имя"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr "Поздравляем, почтовый ящик успешно создан!"
 
@@ -252,19 +264,19 @@ msgid ""
 "Register for a free and anonymous E-Mail address and an XMPP/Jabber account"
 msgstr ""
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Имя пользователя"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
-#: www/admin.php:1025
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Пароль"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Повторите пароль"
 
@@ -302,21 +314,26 @@ msgstr ""
 "доступно из под одной учетной записи. Ваш Jabber ID это user@%1$s он "
 "доступен как через обычный интернет, так и через Tor сеть (%2$s)."
 
-#: www/index.php:25
+#: www/index.php:26
 #, fuzzy, php-format
 #| msgid ""
 #| "You will have 50MB of disk space available for your mails. If you need "
 #| "more space, just <a href=\"%1$s\">contact me</a>. Your E-Mail address "
 #| "will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"You will have %1$s disk space available for your mails. If you need more "
+"space, %2$s."
 msgstr ""
 "Вам будет выделено 50МБ свободного места для ваших писем. Если вам "
 "понадобится больше места, пожалуйста <a href=\"%1$s\">свяжитесь со мной</a>. "
 "Ваш домен E-Mail будет выглядеть как %2$s"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be %s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -325,15 +342,15 @@ msgid ""
 "to make use of WKD automatic discovery for mail clients."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "add it to your account"
 msgstr ""
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -349,30 +366,30 @@ msgid ""
 "favourite desktop mail client and configure it with the settings given below."
 msgstr ""
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "Настройки E-Mail"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) или 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) или 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) или 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Аутентификация: ОБЫЧНАЯ, ЛОГИН"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -382,26 +399,26 @@ msgstr ""
 "необходимо будет принять SSL-сертификат как для обычного интернета "
 "(clearnet)."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "Настройки XMPP"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Домен: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr ""
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr ""
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -429,7 +446,7 @@ msgstr "Неверное имя пользователя"
 msgid "Incorrect username or password"
 msgstr "Неверное имя пользователя или пароль"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Пароль обновлен"
 
@@ -539,16 +556,16 @@ msgstr "2FA Код"
 msgid "Confirm"
 msgstr "Подтвердить"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "Пользователь %s"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Выход"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Войти"
 
@@ -571,11 +588,11 @@ msgstr ""
 "галочку с поля \"сохранять копию\" то ваши письма будут поступать только на "
 "ваши адреса, которые вы указали для пересылки."
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "Переслать на"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr "Сохранять копию"
 
@@ -598,11 +615,11 @@ msgstr ""
 "поддержку шифрования TLS/SSL у своего поставщика услуг электронной почты, "
 "для защиты от чтения ваших писем третьими лицами."
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Включить шифрование входящей почты"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Включить шифрование исходящей почты"
 
@@ -610,8 +627,8 @@ msgstr "Включить шифрование исходящей почты"
 msgid "Update settings"
 msgstr "Обновить настройки"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
-#: www/admin.php:1036
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Изменить пароль"
 
@@ -718,8 +735,8 @@ msgid ""
 "Warning: This will permanently delete the alias domain \"%s\". It cannot be "
 "reversed. Are you absolutely sure?"
 msgstr ""
-"Предупреждение: Это приведет к безвозвратному удалению псевдонима домена \"%s"
-"\". Отменить это действие будет невозможно. Вы абсолютно уверены?"
+"Предупреждение: Это приведет к безвозвратному удалению псевдонима домена "
+"\"%s\". Отменить это действие будет невозможно. Вы абсолютно уверены?"
 
 #: www/admin.php:85
 msgid "Yes, I want to permanently delete this alias domain"
@@ -742,8 +759,8 @@ msgid ""
 "Warning: This will permanently delete the mailbox \"%s\". It cannot be "
 "reversed. Are you absolutely sure?"
 msgstr ""
-"Предупреждение: Это приведет к безвозвратному удалению почтового ящика \"%s"
-"\". Отменить это действие будет невозможно. Вы абсолютно уверены?"
+"Предупреждение: Это приведет к безвозвратному удалению почтового ящика "
+"\"%s\". Отменить это действие будет невозможно. Вы абсолютно уверены?"
 
 #: www/admin.php:95
 msgid "Yes, I want to permanently delete this mailbox"
@@ -848,271 +865,271 @@ msgstr ""
 msgid "Successfully updated alias."
 msgstr "Псевдоним успешно обновлен."
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr "Почтовый ящик успешно обновлен."
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr "Двухфакторная аутентификация успешно отключена"
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr ""
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr ""
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr ""
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr ""
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr ""
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr ""
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr ""
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
 msgstr ""
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
 msgstr ""
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr ""
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr ""
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
-#: www/admin.php:1001
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
+#: www/admin.php:999
 msgid "Active"
 msgstr ""
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
-#: www/admin.php:909
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
+#: www/admin.php:907
 msgid "Last modified"
 msgstr ""
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr ""
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 #, fuzzy
 #| msgid "Disable account"
 msgid "Disabled"
 msgstr "Отключить аккаунт"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
-#: www/admin.php:922
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Редактировать"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr ""
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr ""
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr ""
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr ""
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr ""
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr ""
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr ""
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr ""
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr ""
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr ""
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr ""
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 #, fuzzy
 #| msgid "Settings"
 msgid "Deleting"
 msgstr "Настройки"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr ""
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr ""
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr ""
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr ""
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr ""
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr ""
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr ""
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr ""
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr ""
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr ""
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr ""
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr ""
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr ""
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr ""
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr ""
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr ""
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr ""
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr ""
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr ""
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr ""
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr ""
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr ""
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr ""
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr ""
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr ""
 
diff --git a/locale/tr_TR/LC_MESSAGES/mail-hosting.po b/locale/tr_TR/LC_MESSAGES/mail-hosting.po
index ca7252b..4b9efee 100644
--- a/locale/tr_TR/LC_MESSAGES/mail-hosting.po
+++ b/locale/tr_TR/LC_MESSAGES/mail-hosting.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:41+0200\n"
 "PO-Revision-Date: 2023-05-04 00:26+0000\n"
 "Last-Translator: Haydar Erdoğan <bygenc19@gmail.com>\n"
 "Language-Team: Turkish <https://weblate.danwin1210.de/projects/DanWin/mail-"
@@ -26,36 +26,44 @@ msgid ""
 "deleting it."
 msgstr ""
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr ""
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, php-format
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr ""
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Kopyala:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
 "wasn't added to the forwarding list."
 msgstr ""
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr ""
 
-#: common_config.php:298
+#: common_config.php:338
 msgid "Invalid email address."
 msgstr ""
 
@@ -84,6 +92,10 @@ msgstr ""
 msgid "Error setting up database:"
 msgstr ""
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 #, fuzzy
 #| msgid "E-Mail and XMPP - Manage account"
@@ -109,12 +121,12 @@ msgstr "Kayıt ol"
 msgid "Manage account"
 msgstr "Hesabı yönet"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -165,34 +177,34 @@ msgstr ""
 msgid "You are responsible for the security of your account and password."
 msgstr ""
 
-#: www/terms.php:32
+#: www/terms.php:33
 #, php-format
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
-"you can %s, and I will increase it for free."
+"Your email account has %1$s of disk space by default. If you need more, you "
+"can %2$s, and I will increase it for free."
 msgstr ""
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr ""
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
 "available per user."
 msgstr ""
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -218,7 +230,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr ""
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Parolalar eşleşmiyor"
 
@@ -234,11 +246,11 @@ msgstr ""
 msgid "The username you specified is reserved"
 msgstr ""
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr ""
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr ""
 
@@ -251,19 +263,19 @@ msgid ""
 "Register for a free and anonymous E-Mail address and an XMPP/Jabber account"
 msgstr ""
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Kullanıcı adı"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
-#: www/admin.php:1025
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Şifre"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Şifre Tekrar"
 
@@ -299,21 +311,26 @@ msgstr ""
 "Jabber hesabı alırsınız. Jabber kimliğiniz user@%1$s şeklindedir ve doğrudan "
 "clearnet'ten veya Tor gizli hizmeti (%2$s) üzerinden bağlanabilir."
 
-#: www/index.php:25
+#: www/index.php:26
 #, fuzzy, php-format
 #| msgid ""
 #| "You will have 50MB of disk space available for your mails. If you need "
 #| "more space, just <a href=\"%1$s\">contact me</a>. Your E-Mail address "
 #| "will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"You will have %1$s disk space available for your mails. If you need more "
+"space, %2$s."
 msgstr ""
 "Postalarınız için 50 MB boş disk alanınız olacak. Daha fazla alana "
 "ihtiyacınız varsa <a href=\"%1$s\">benimle iletişime geçin</a>. E-Mail "
 "adresiniz %2$s olacak"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be %s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -322,15 +339,15 @@ msgid ""
 "to make use of WKD automatic discovery for mail clients."
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr ""
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "add it to your account"
 msgstr ""
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -346,30 +363,30 @@ msgid ""
 "favourite desktop mail client and configure it with the settings given below."
 msgstr ""
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "E-Posta Kurulumu"
 
-#: www/index.php:30
+#: www/index.php:33
 #, fuzzy, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, fuzzy, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, fuzzy, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Kimlik doğrulama: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -379,26 +396,26 @@ msgstr ""
 "bağlanabilirsiniz, ancak yalnızca clearnet etki alanı için geçerli bir SSL "
 "sertifikasını kabul etmeniz gerekecektir."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "XMPP kurulumu"
 
-#: www/index.php:37
+#: www/index.php:40
 #, fuzzy, php-format
 msgid "Domain: %s"
 msgstr "Domain: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr "Sunucuyu bağla: %s (torifikasyon için isteğe bağlı)"
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr "Dosya aktarım proxy'si: %s"
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -428,7 +445,7 @@ msgstr "Geçersiz kullanıcı adı"
 msgid "Incorrect username or password"
 msgstr "Yanlış kullanıcı adı ya da parola"
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr "Parola başarıyla güncellendi"
 
@@ -537,16 +554,16 @@ msgstr "2FA kodu"
 msgid "Confirm"
 msgstr "Onayla"
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr "%s olarak giriş yaptı"
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr "Çıkış Yap"
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Giriş"
 
@@ -569,11 +586,11 @@ msgstr ""
 "kopyasını sakla\" onay kutusunu devre dışı bıraktığınızda, postalarınız "
 "yalnızca yönlendirme adreslerinize gönderilecektir."
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr "İlet"
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr "Yerel bir kopya tutun"
 
@@ -595,11 +612,11 @@ msgstr ""
 "okumasını mümkün kıldığını unutmayın. Muhabirinizden daha güvenli bir "
 "internet için sağlayıcılarından şifreleme desteği talep etmesini isteyin."
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr "Gelen posta için şifrelemeyi zorunlu kıl"
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr "Giden posta için şifreleme uygula"
 
@@ -607,8 +624,8 @@ msgstr "Giden posta için şifreleme uygula"
 msgid "Update settings"
 msgstr "Ayarları güncelle"
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
-#: www/admin.php:1036
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
+#: www/admin.php:1034
 msgid "Change password"
 msgstr "Şifre değiştir"
 
@@ -846,271 +863,271 @@ msgstr ""
 msgid "Successfully updated alias."
 msgstr ""
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr ""
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr ""
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr ""
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr ""
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr ""
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr ""
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr ""
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr ""
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr ""
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
 msgstr ""
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
 msgstr ""
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr ""
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr "Yönetici"
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
-#: www/admin.php:1001
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
+#: www/admin.php:999
 msgid "Active"
 msgstr ""
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
-#: www/admin.php:909
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
+#: www/admin.php:907
 msgid "Last modified"
 msgstr ""
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr ""
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 #, fuzzy
 #| msgid "Disable account"
 msgid "Disabled"
 msgstr "Hesabı devre dışı bırak"
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
-#: www/admin.php:922
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Düzenle"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr ""
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr ""
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr ""
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr ""
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr "Değişiklikleri kaydet"
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr ""
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr ""
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr ""
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr ""
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr ""
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr ""
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 #, fuzzy
 #| msgid "Settings"
 msgid "Deleting"
 msgstr "Ayarlar"
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr ""
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr ""
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr ""
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr ""
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr ""
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr ""
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr ""
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr ""
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr ""
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr ""
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr ""
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr ""
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr ""
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr ""
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr ""
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr ""
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr ""
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr ""
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr ""
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr ""
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr ""
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr ""
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr ""
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr ""
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr ""
 
@@ -1128,6 +1145,6 @@ msgstr ""
 #~ "Gizlilik için, yapabiliyorsanız lütfen PGP posta şifreleme kullanın. Bu, "
 #~ "başkalarının (ben ve/veya LEA dahil) postalarınızı okumasını engeller. "
 #~ "GnuPG'lerin resmi evi: <a href=\"https://gnupg.org\" target=\"_blank\" "
-#~ "rel=\"noopener noreferrer\">https://gnupg.org</a> Windows GUI: <a href="
-#~ "\"https: //gpg4usb.org\" target=\"_blank\" rel=\"noopener noreferrer"
-#~ "\">https://gpg4usb.org</a>"
+#~ "rel=\"noopener noreferrer\">https://gnupg.org</a> Windows GUI: <a "
+#~ "href=\"https: //gpg4usb.org\" target=\"_blank\" rel=\"noopener "
+#~ "noreferrer\">https://gpg4usb.org</a>"
diff --git a/locale/uk_UA/LC_MESSAGES/mail-hosting.po b/locale/uk_UA/LC_MESSAGES/mail-hosting.po
index 9b9e1aa..48dea6d 100644
--- a/locale/uk_UA/LC_MESSAGES/mail-hosting.po
+++ b/locale/uk_UA/LC_MESSAGES/mail-hosting.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-21 11:56+0200\n"
+"POT-Creation-Date: 2024-07-08 15:41+0200\n"
 "PO-Revision-Date: 2023-10-14 18:51+0000\n"
 "Last-Translator: Анонім <g2014test@yandex.com>\n"
 "Language-Team: Ukrainian <https://weblate.danwin1210.de/projects/DanWin/mail-"
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 5.0.2\n"
 
 #: tools/delete_leftover_files.php:14
@@ -29,27 +29,40 @@ msgstr ""
 "Здається, у %s немає облікових записів, але є каталог. Подумайте про те, щоб "
 "видалити його."
 
-#: tools/delete_leftover_files.php:20
+#: tools/delete_leftover_files.php:20 tools/delete_leftover_files.php:39
+#: tools/delete_leftover_files.php:57
 #, php-format
 msgid "Deleted: %s"
 msgstr "Видалено: %s"
 
-#: tools/delete_leftover_files.php:22
+#: tools/delete_leftover_files.php:22 tools/delete_leftover_files.php:41
 #, php-format
 msgid "File found in mail directory location: \"%s\". Consider deleting it."
 msgstr ""
 "Файл знайдено в поштовому каталозі за адресою: \"%s\". Подумайте про те, щоб "
 "видалити його."
 
-#: common_config.php:93 setup.php:20 setup.php:23 cron.php:11
+#: tools/delete_leftover_files.php:33
+#, fuzzy, php-format
+#| msgid ""
+#| "%s does not seem to have any accounts, but has a directory. Consider "
+#| "deleting it."
+msgid ""
+"%s does not seem to have any accounts, but has a snappymail directory. "
+"Consider deleting it."
+msgstr ""
+"Здається, у %s немає облікових записів, але є каталог. Подумайте про те, щоб "
+"видалити його."
+
+#: common_config.php:94 setup.php:20 setup.php:23 cron.php:11
 msgid "No Connection to MySQL database!"
 msgstr "Немає підключення до бази даних MySQL!"
 
-#: common_config.php:142
+#: common_config.php:143
 msgid "Copy:"
 msgstr "Перепишіть:"
 
-#: common_config.php:261
+#: common_config.php:301
 #, php-format
 msgid ""
 "Oops, the email \"%s\" doesn' look like a valid email address and thus "
@@ -58,11 +71,11 @@ msgstr ""
 "На жаль, «%s» не схоже на дійсну адресу електронної пошти і, отже, не було "
 "додане до списку переадресації."
 
-#: common_config.php:287
+#: common_config.php:327
 msgid "You are not allowed to manage this domain."
 msgstr "Вам заборонено керувати цим доменом."
 
-#: common_config.php:298
+#: common_config.php:338
 msgid "Invalid email address."
 msgstr "Неправильна адреса електронної пошти."
 
@@ -91,6 +104,10 @@ msgstr "База даних успішно налаштована."
 msgid "Error setting up database:"
 msgstr "Помилка під час налаштування бази даних:"
 
+#: setup.php:70
+msgid "Error adding primary domain:"
+msgstr ""
+
 #: www/terms.php:6 www/terms.php:15 www/terms.php:19
 msgid "E-Mail and XMPP - Terms of Service"
 msgstr "E-Mail і XMPP – Умови надання послуг"
@@ -114,12 +131,12 @@ msgstr "Реєстрація"
 msgid "Manage account"
 msgstr "Управління обліковим записом"
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SquirrelMail"
 msgstr ""
 
-#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:27
+#: www/terms.php:22 www/register.php:99 www/index.php:22 www/index.php:30
 #: www/manage_account.php:248
 msgid "SnappyMail"
 msgstr ""
@@ -181,21 +198,24 @@ msgid "You are responsible for the security of your account and password."
 msgstr ""
 "Ви несете відповідальність за безпеку свого облікового запису та пароля."
 
-#: www/terms.php:32
-#, php-format
+#: www/terms.php:33
+#, fuzzy, php-format
+#| msgid ""
+#| "Your email account only has 50MB of disk space by default. If you need "
+#| "more, you can %s, and I will increase it for free."
 msgid ""
-"Your email account only has 50MB of disk space by default. If you need more, "
-"you can %s, and I will increase it for free."
+"Your email account has %1$s of disk space by default. If you need more, you "
+"can %2$s, and I will increase it for free."
 msgstr ""
 "За замовчуванням в обліковому записі електронної пошти доступно лише 50 МБ "
 "дискового простору. Якщо Вам потрібно більше, Ви можете %s, і я збільшу його "
 "безкоштовно."
 
-#: www/terms.php:32 www/index.php:25
+#: www/terms.php:33 www/index.php:26
 msgid "contact me"
 msgstr "зв'язатися зі мною"
 
-#: www/terms.php:33
+#: www/terms.php:35
 msgid ""
 "The XMPP service provides message archiving and HTTP upload, which can keep "
 "your messages and files for up to 1 week. Up to 100MB of file storage is "
@@ -205,19 +225,19 @@ msgstr ""
 "HTTP, що дозволяє зберігати Ваші повідомлення і файли до 1 тижня. Кожному "
 "користувачу доступно до 100 МБ файлового сховища."
 
-#: www/terms.php:34
+#: www/terms.php:36
 msgid ""
 "I reserve the right to block or delete your account without prior notice."
 msgstr ""
 "Я залишаю за собою право заблокувати або видалити Ваш обліковий запис без "
 "попереднього повідомлення."
 
-#: www/terms.php:35
+#: www/terms.php:37
 msgid "I reserve the right to change these terms without prior notice."
 msgstr ""
 "Я залишаю за собою право змінювати ці умови без попереднього повідомлення."
 
-#: www/terms.php:36
+#: www/terms.php:38
 msgid "Continued violations may necessitate the closure of registration."
 msgstr ""
 
@@ -243,7 +263,7 @@ msgid "Invalid username. It may not contain a +, ', \" or /."
 msgstr "Неправильне ім'я користувача. Воно може не містити +, ', \" або /."
 
 #: www/register.php:37 www/manage_account.php:100 www/admin.php:175
-#: www/admin.php:343
+#: www/admin.php:341
 msgid "Passwords empty or don't match"
 msgstr "Паролі порожні або не збігаються"
 
@@ -259,11 +279,11 @@ msgstr "Вказана Вами адреса електронної пошти 
 msgid "The username you specified is reserved"
 msgstr "Вказане Вами ім'я користувача зарезервовано"
 
-#: www/register.php:66 www/admin.php:311
+#: www/register.php:66 www/admin.php:310
 msgid "Sorry, this user already exists"
 msgstr "Вибачте, такий користувач вже існує"
 
-#: www/register.php:74 www/admin.php:333
+#: www/register.php:74 www/admin.php:331
 msgid "Successfully created new mailbox!"
 msgstr "Нову поштову скриньку успішно створено!"
 
@@ -278,19 +298,19 @@ msgstr ""
 "Зареєструйтесь для отримання безплатної та анонімної електронної пошти та "
 "XMPP/Jabber"
 
-#: www/register.php:108 www/manage_account.php:255 www/admin.php:407
-#: www/admin.php:580 www/admin.php:907 www/admin.php:936
+#: www/register.php:108 www/manage_account.php:255 www/admin.php:405
+#: www/admin.php:578 www/admin.php:905 www/admin.php:934
 msgid "Username"
 msgstr "Ім'я користувача"
 
 #: www/register.php:112 www/manage_account.php:260 www/manage_account.php:323
-#: www/admin.php:411 www/admin.php:501 www/admin.php:584 www/admin.php:940
-#: www/admin.php:1025
+#: www/admin.php:409 www/admin.php:499 www/admin.php:582 www/admin.php:938
+#: www/admin.php:1023
 msgid "Password"
 msgstr "Пароль"
 
-#: www/register.php:116 www/manage_account.php:328 www/admin.php:506
-#: www/admin.php:589 www/admin.php:944 www/admin.php:1030
+#: www/register.php:116 www/manage_account.php:328 www/admin.php:504
+#: www/admin.php:587 www/admin.php:942 www/admin.php:1028
 msgid "Password again"
 msgstr "Повторіть пароль"
 
@@ -327,16 +347,24 @@ msgstr ""
 "нього можна підключитися безпосередньо з clearnet або через приховану службу "
 "Tor (%2$s)."
 
-#: www/index.php:25
-#, php-format
+#: www/index.php:26
+#, fuzzy, php-format
+#| msgid ""
+#| "You will have 50MB of disk space available for your mails. If you need "
+#| "more space, %1$s. Your E-Mail address will be %2$s"
 msgid ""
-"You will have 50MB of disk space available for your mails. If you need more "
-"space, %1$s. Your E-Mail address will be %2$s"
+"You will have %1$s disk space available for your mails. If you need more "
+"space, %2$s."
 msgstr ""
 "Вам буде доступно 50 МБ дискового простору для Ваших листів. Якщо Вам "
 "потрібно більше місця, %1$s. Ваша електронна адреса буде на @%2$s"
 
-#: www/index.php:26
+#: www/index.php:28
+#, php-format
+msgid "Your E-Mail address will be %s"
+msgstr ""
+
+#: www/index.php:29
 #, php-format
 msgid ""
 "For privacy, please use PGP mail encryption, if you can. This prevents "
@@ -350,15 +378,15 @@ msgstr ""
 "створення ключа PGP Ви можете %2$s, щоб використовувати автоматичне "
 "виявлення WKD для поштових клієнтів."
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "download GnuPG"
 msgstr "завантажити GnuPG"
 
-#: www/index.php:26
+#: www/index.php:29
 msgid "add it to your account"
 msgstr "додати його до свого облікового запису"
 
-#: www/index.php:27
+#: www/index.php:30
 #, php-format
 msgid ""
 "You can choose between two Web-Mail clients installed on the server. %1$s is "
@@ -386,30 +414,30 @@ msgstr ""
 "просто скористатися улюбленим десктопним поштовим клієнтом і налаштувати "
 "його за допомогою наведених нижче налаштувань."
 
-#: www/index.php:28
+#: www/index.php:31
 msgid "E-Mail Setup"
 msgstr "Налаштування e-mail"
 
-#: www/index.php:30
+#: www/index.php:33
 #, php-format
 msgid "SMTP: %s Port 465 (SSL/TLS) or 587 (StartTLS)"
 msgstr "SMTP: %s Порт 465 (SSL/TLS) або 587 (StartTLS)"
 
-#: www/index.php:31
+#: www/index.php:34
 #, php-format
 msgid "IMAP: %s Port 993 (SSL/TLS) or 143 (StartTLS)"
 msgstr "IMAP: %s Порт 993 (SSL/TLS) або 143 (StartTLS)"
 
-#: www/index.php:32
+#: www/index.php:35
 #, php-format
 msgid "POP3: %s Port 995 (SSL/TLS) or 110 (StartTLS)"
 msgstr "POP3: %s Порт 995 (SSL/TLS) або 110 (StartTLS)"
 
-#: www/index.php:33
+#: www/index.php:36
 msgid "Authentication: PLAIN, LOGIN"
 msgstr "Аутентифікація: PLAIN, LOGIN"
 
-#: www/index.php:35
+#: www/index.php:38
 #, php-format
 msgid ""
 "You can also connect on the same ports via the Tor onion address %s, but you "
@@ -418,26 +446,26 @@ msgstr ""
 "Ви також можете підключитися до тих самих портів через Tor onion адресу %s, "
 "але Вам доведеться прийняти сертифікат SSL, дійсний лише для домену clearnet."
 
-#: www/index.php:36
+#: www/index.php:39
 msgid "XMPP setup"
 msgstr "Налаштування XMPP"
 
-#: www/index.php:37
+#: www/index.php:40
 #, php-format
 msgid "Domain: %s"
 msgstr "Домен: %s"
 
-#: www/index.php:38
+#: www/index.php:41
 #, php-format
 msgid "Connect server: %s (optional for torification)"
 msgstr ""
 
-#: www/index.php:39
+#: www/index.php:42
 #, php-format
 msgid "File transfer proxy: %s"
 msgstr ""
 
-#: www/index.php:40
+#: www/index.php:43
 #, php-format
 msgid ""
 "BOSH URL: %s (only enable if you have to, as it is slower than directly "
@@ -465,7 +493,7 @@ msgstr ""
 msgid "Incorrect username or password"
 msgstr ""
 
-#: www/manage_account.php:105 www/admin.php:348
+#: www/manage_account.php:105 www/admin.php:346
 msgid "Successfully updated password"
 msgstr ""
 
@@ -558,16 +586,16 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: www/manage_account.php:239 www/admin.php:389
+#: www/manage_account.php:239 www/admin.php:387
 #, php-format
 msgid "Logged in as %s"
 msgstr ""
 
-#: www/manage_account.php:245 www/admin.php:390
+#: www/manage_account.php:245 www/admin.php:388
 msgid "Logout"
 msgstr ""
 
-#: www/manage_account.php:266 www/admin.php:416
+#: www/manage_account.php:266 www/admin.php:414
 msgid "Login"
 msgstr "Увійти"
 
@@ -586,11 +614,11 @@ msgid ""
 "checkbox, your mail will only be sent to your forwarding addresses."
 msgstr ""
 
-#: www/manage_account.php:288 www/admin.php:948 www/admin.php:989
+#: www/manage_account.php:288 www/admin.php:946 www/admin.php:987
 msgid "Forward to"
 msgstr ""
 
-#: www/manage_account.php:293 www/admin.php:952 www/admin.php:994
+#: www/manage_account.php:293 www/admin.php:950 www/admin.php:992
 msgid "Keep a local copy"
 msgstr ""
 
@@ -607,11 +635,11 @@ msgid ""
 "provider for a safer internet."
 msgstr ""
 
-#: www/manage_account.php:301 www/admin.php:959 www/admin.php:1006
+#: www/manage_account.php:301 www/admin.php:957 www/admin.php:1004
 msgid "Enforce encryption for incoming mail"
 msgstr ""
 
-#: www/manage_account.php:307 www/admin.php:963 www/admin.php:1011
+#: www/manage_account.php:307 www/admin.php:961 www/admin.php:1009
 msgid "Enforce encryption for outgoing mail"
 msgstr ""
 
@@ -619,8 +647,8 @@ msgstr ""
 msgid "Update settings"
 msgstr ""
 
-#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1020
-#: www/admin.php:1036
+#: www/manage_account.php:319 www/manage_account.php:334 www/admin.php:1018
+#: www/admin.php:1034
 msgid "Change password"
 msgstr ""
 
@@ -837,266 +865,266 @@ msgstr ""
 msgid "Successfully updated alias."
 msgstr ""
 
-#: www/admin.php:298
+#: www/admin.php:297
 msgid "Successfully updated mailbox."
 msgstr ""
 
-#: www/admin.php:359
+#: www/admin.php:357
 msgid "Successfully disabled two-factor authentication"
 msgstr ""
 
-#: www/admin.php:369 www/admin.php:378 www/admin.php:382 www/admin.php:385
+#: www/admin.php:367 www/admin.php:376 www/admin.php:380 www/admin.php:383
 msgid "E-Mail and XMPP - Admin management"
 msgstr ""
 
-#: www/admin.php:373 www/admin.php:379 www/admin.php:382
+#: www/admin.php:371 www/admin.php:377 www/admin.php:380
 msgid "Lets domain owners manage their email domain and user accounts."
 msgstr ""
 
-#: www/admin.php:392
+#: www/admin.php:390
 msgid "Manage admins"
 msgstr ""
 
-#: www/admin.php:393
+#: www/admin.php:391
 msgid "Manage alias domains"
 msgstr ""
 
-#: www/admin.php:395
+#: www/admin.php:393
 msgid "Manage your admin account"
 msgstr ""
 
-#: www/admin.php:397
+#: www/admin.php:395
 msgid "Manage domains"
 msgstr ""
 
-#: www/admin.php:398
+#: www/admin.php:396
 msgid "Manage aliases"
 msgstr ""
 
-#: www/admin.php:399
+#: www/admin.php:397
 msgid "Manage mailboxes"
 msgstr ""
 
-#: www/admin.php:422
+#: www/admin.php:420
 msgid ""
 "Welcome to the admin management interface. You can configure your domain(s) "
 "and accounts here. Please select an option from the menu."
 msgstr ""
 
-#: www/admin.php:454
+#: www/admin.php:452
 msgid ""
 "Oops, it looks like the page you tried to access does not exist or you do "
 "not have permission to access it."
 msgstr ""
 
-#: www/admin.php:467 www/admin.php:483
+#: www/admin.php:465 www/admin.php:481
 msgid "Create new admin"
 msgstr ""
 
-#: www/admin.php:472
+#: www/admin.php:470
 msgid "Admin"
 msgstr ""
 
-#: www/admin.php:473 www/admin.php:479 www/admin.php:519 www/admin.php:532
-#: www/admin.php:598 www/admin.php:622 www/admin.php:630 www/admin.php:654
-#: www/admin.php:678 www/admin.php:712 www/admin.php:718 www/admin.php:743
-#: www/admin.php:773 www/admin.php:806 www/admin.php:814 www/admin.php:838
-#: www/admin.php:872 www/admin.php:908 www/admin.php:916 www/admin.php:956
-#: www/admin.php:1001
+#: www/admin.php:471 www/admin.php:477 www/admin.php:517 www/admin.php:530
+#: www/admin.php:596 www/admin.php:620 www/admin.php:628 www/admin.php:652
+#: www/admin.php:676 www/admin.php:710 www/admin.php:716 www/admin.php:741
+#: www/admin.php:771 www/admin.php:804 www/admin.php:812 www/admin.php:836
+#: www/admin.php:870 www/admin.php:906 www/admin.php:914 www/admin.php:954
+#: www/admin.php:999
 msgid "Active"
 msgstr ""
 
-#: www/admin.php:474 www/admin.php:623 www/admin.php:713 www/admin.php:807
-#: www/admin.php:909
+#: www/admin.php:472 www/admin.php:621 www/admin.php:711 www/admin.php:805
+#: www/admin.php:907
 msgid "Last modified"
 msgstr ""
 
-#: www/admin.php:475
+#: www/admin.php:473
 msgid "Edit account"
 msgstr ""
 
-#: www/admin.php:479 www/admin.php:628 www/admin.php:718 www/admin.php:812
+#: www/admin.php:477 www/admin.php:626 www/admin.php:716 www/admin.php:810
 msgid "Disabled"
 msgstr ""
 
-#: www/admin.php:480 www/admin.php:634 www/admin.php:719 www/admin.php:816
-#: www/admin.php:922
+#: www/admin.php:478 www/admin.php:632 www/admin.php:717 www/admin.php:814
+#: www/admin.php:920
 msgid "Edit"
 msgstr "Редагувати"
 
-#: www/admin.php:495
+#: www/admin.php:493
 #, php-format
 msgid "Edit admin account %s"
 msgstr ""
 
-#: www/admin.php:513 www/admin.php:526 www/admin.php:594
+#: www/admin.php:511 www/admin.php:524 www/admin.php:592
 msgid "Superadmin"
 msgstr ""
 
-#: www/admin.php:515 www/admin.php:527 www/admin.php:595
+#: www/admin.php:513 www/admin.php:525 www/admin.php:593
 msgid "Superadmins can manage other admins"
 msgstr ""
 
-#: www/admin.php:536
+#: www/admin.php:534
 msgid "Managed domains"
 msgstr ""
 
-#: www/admin.php:556 www/admin.php:683 www/admin.php:778 www/admin.php:881
+#: www/admin.php:554 www/admin.php:681 www/admin.php:776 www/admin.php:879
 msgid "Save changes"
 msgstr ""
 
-#: www/admin.php:562
+#: www/admin.php:560
 msgid "Delete admin"
 msgstr ""
 
-#: www/admin.php:569 www/admin.php:694
+#: www/admin.php:567 www/admin.php:692
 msgid "Oops, this admin doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:576
+#: www/admin.php:574
 msgid "Create new admin account"
 msgstr ""
 
-#: www/admin.php:602
+#: www/admin.php:600
 msgid "Add admin"
 msgstr ""
 
-#: www/admin.php:615 www/admin.php:638 www/admin.php:646
+#: www/admin.php:613 www/admin.php:636 www/admin.php:644
 msgid "Create new domain"
 msgstr ""
 
-#: www/admin.php:621 www/admin.php:650
+#: www/admin.php:619 www/admin.php:648
 msgid "Domain"
 msgstr ""
 
-#: www/admin.php:624
+#: www/admin.php:622
 msgid "Edit domain"
 msgstr ""
 
-#: www/admin.php:632 www/admin.php:920
+#: www/admin.php:630 www/admin.php:918
 msgid "Deleting"
 msgstr ""
 
-#: www/admin.php:658
+#: www/admin.php:656
 msgid "Add domain"
 msgstr ""
 
-#: www/admin.php:672
+#: www/admin.php:670
 #, php-format
 msgid "Edit domain %s"
 msgstr ""
 
-#: www/admin.php:688
+#: www/admin.php:686
 msgid "Delete domain"
 msgstr ""
 
-#: www/admin.php:704 www/admin.php:723 www/admin.php:731
+#: www/admin.php:702 www/admin.php:721 www/admin.php:729
 msgid "Create new alias domain"
 msgstr ""
 
-#: www/admin.php:710 www/admin.php:735
+#: www/admin.php:708 www/admin.php:733
 msgid "Alias Domain"
 msgstr ""
 
-#: www/admin.php:711 www/admin.php:739 www/admin.php:767
+#: www/admin.php:709 www/admin.php:737 www/admin.php:765
 msgid "Target Domain"
 msgstr ""
 
-#: www/admin.php:714
+#: www/admin.php:712
 msgid "Edit alias domain"
 msgstr ""
 
-#: www/admin.php:747
+#: www/admin.php:745
 msgid "Add alias domain"
 msgstr ""
 
-#: www/admin.php:761
+#: www/admin.php:759
 #, php-format
 msgid "Edit alias domain %s"
 msgstr ""
 
-#: www/admin.php:783
+#: www/admin.php:781
 msgid "Delete alias domain"
 msgstr ""
 
-#: www/admin.php:789
+#: www/admin.php:787
 msgid "Oops, this alias domain doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:799 www/admin.php:819 www/admin.php:826
+#: www/admin.php:797 www/admin.php:817 www/admin.php:824
 msgid "Create new alias"
 msgstr ""
 
-#: www/admin.php:804 www/admin.php:830
+#: www/admin.php:802 www/admin.php:828
 msgid "Alias"
 msgstr ""
 
-#: www/admin.php:805 www/admin.php:834 www/admin.php:865
+#: www/admin.php:803 www/admin.php:832 www/admin.php:863
 msgid "Target"
 msgstr ""
 
-#: www/admin.php:808
+#: www/admin.php:806
 msgid "Edit alias"
 msgstr ""
 
-#: www/admin.php:841 www/admin.php:877
+#: www/admin.php:839 www/admin.php:875
 msgid "Enforce encryption"
 msgstr ""
 
-#: www/admin.php:846
+#: www/admin.php:844
 msgid "Add alias"
 msgstr ""
 
-#: www/admin.php:860
+#: www/admin.php:858
 #, php-format
 msgid "Edit alias %s"
 msgstr ""
 
-#: www/admin.php:886
+#: www/admin.php:884
 msgid "Delete alias"
 msgstr ""
 
-#: www/admin.php:892
+#: www/admin.php:890
 msgid "Oops, this alias doesn't seem to exist."
 msgstr ""
 
-#: www/admin.php:902 www/admin.php:925 www/admin.php:932
+#: www/admin.php:900 www/admin.php:923 www/admin.php:930
 msgid "Create new mailbox"
 msgstr ""
 
-#: www/admin.php:910
+#: www/admin.php:908
 msgid "Edit mailbox"
 msgstr ""
 
-#: www/admin.php:918
+#: www/admin.php:916
 msgid "Disabling"
 msgstr ""
 
-#: www/admin.php:968
+#: www/admin.php:966
 msgid "Add mailbox"
 msgstr ""
 
-#: www/admin.php:984
+#: www/admin.php:982
 #, php-format
 msgid "Edit mailbox %s"
 msgstr ""
 
-#: www/admin.php:1016
+#: www/admin.php:1014
 msgid "Save mailbox"
 msgstr ""
 
-#: www/admin.php:1040
+#: www/admin.php:1038
 msgid "Delete mailbox / Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1046
+#: www/admin.php:1044
 msgid "Disable two-factor authentication"
 msgstr ""
 
-#: www/admin.php:1051
+#: www/admin.php:1049
 msgid "Delete mailbox"
 msgstr ""
 
-#: www/admin.php:1057
+#: www/admin.php:1055
 msgid "Oops, this mailbox doesn't seem to exist."
 msgstr ""