diff --git a/languages/bg.lang b/languages/bg.lang
index 5b074570..28841e19 100644
--- a/languages/bg.lang
+++ b/languages/bg.lang
@@ -240,7 +240,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Не мога да модифици
 $PALANG['pAdminCreate_admin_welcome'] = 'Добави нов админ на домейна';
 $PALANG['pAdminCreate_admin_username_text'] = 'Е-мейл адрес';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Админ не е валиден е-мейл адрес!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Админ-а вече съществува или не е валиден';
+$PALANG['admin_already_exists'] = 'Админ-а вече съществува или не е валиден'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Добави админ';
 $PALANG['pAdminCreate_admin_result_error'] = 'Не мога да добавя админа! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Админа беше добавен успешно! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/ca.lang b/languages/ca.lang
index 61ebf23c..477c0f2c 100644
--- a/languages/ca.lang
+++ b/languages/ca.lang
@@ -238,7 +238,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Imposible modificar el domini! (%s)
 $PALANG['pAdminCreate_admin_welcome'] = 'Afegir un nou administrador de domini';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail vàlid!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'administrador ja existeix o no es vàlid!';
+$PALANG['admin_already_exists'] = 'L\'administrador ja existeix o no es vàlid!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 
 $PALANG['pAdminCreate_admin_button'] = 'Afegir administrador';
 $PALANG['pAdminCreate_admin_result_error'] = 'Imposible afegir l\'administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
diff --git a/languages/cn.lang b/languages/cn.lang
index a8f5c6c3..bb6f31fe 100644
--- a/languages/cn.lang
+++ b/languages/cn.lang
@@ -239,7 +239,8 @@ $PALANG['pAdminEdit_domain_result_error'] = '修改域失败! (%s)'; # XXX Text
 $PALANG['pAdminCreate_admin_welcome'] = '新增域管理员';
 $PALANG['pAdminCreate_admin_username_text'] = '邮件地址';
 $PALANG['pAdminCreate_admin_username_text_error1'] = '管理员名不是一个合法的邮件地址!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = '管理员已经存在或者管理员名非法!';
+$PALANG['admin_already_exists'] = '管理员已经存在或者管理员名非法!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = '新增';
 $PALANG['pAdminCreate_admin_result_error'] = '新增管理员失败! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = '新增管理员成功! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/cs.lang b/languages/cs.lang
index 95f81300..676c1a7a 100644
--- a/languages/cs.lang
+++ b/languages/cs.lang
@@ -248,7 +248,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Nepodařilo se upravit doménu! (%s
 $PALANG['pAdminCreate_admin_welcome'] = 'Přidat nového doménového administrátora';
 $PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Tato adresa není platná!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Taková adresa již existuje!';
+$PALANG['admin_already_exists'] = 'Taková adresa již existuje!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Přidat administrátora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nepodařilo se přidat administrátora! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrátor byl přidán! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/da.lang b/languages/da.lang
index fee13f41..d4b14489 100644
--- a/languages/da.lang
+++ b/languages/da.lang
@@ -248,7 +248,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Kan ikke rette domænet! (%s)'; # X
 $PALANG['pAdminCreate_admin_welcome']              = 'Tilføj en ny domæneadministrator';
 $PALANG['pAdminCreate_admin_username_text'] = 'Emailadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke en gyldig emailadresse!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Aministratoren findes allerede eller er ikke gyldig';
+$PALANG['admin_already_exists'] = 'Aministratoren findes allerede eller er ikke gyldig'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Tilføj administrator';
 $PALANG['pAdminCreate_admin_result_error']         = 'Administratoren kunne ikke tilføjes! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success']       = 'Administratoren er tilføjet! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/de.lang b/languages/de.lang
index e4f64308..04b1d36c 100644
--- a/languages/de.lang
+++ b/languages/de.lang
@@ -245,7 +245,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Das Ändern der Domain %s ist fehlg
 $PALANG['pAdminCreate_admin_welcome'] = 'Neuen Domain-Admin hinzufügen';
 $PALANG['pAdminCreate_admin_username_text'] = 'Email Adresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin-Adresse ist keine echte Email-Adresse!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Der Admin existiert bereits bzw. ist nicht korrekt';
+$PALANG['admin_already_exists'] = 'Der Admin existiert bereits!';
+$PALANG['admin_does_not_exist'] = 'Der Admin existiert nicht!';
 $PALANG['pAdminCreate_admin_button'] = 'Admin hinzufügen';
 $PALANG['pAdminCreate_admin_result_error'] = 'Das anlegen des Admins %s ist fehlgeschlagen';
 $PALANG['pAdminCreate_admin_result_success'] = 'Der Admin %s wurde angelegt.';
diff --git a/languages/en.lang b/languages/en.lang
index 08b9287c..c62a0119 100644
--- a/languages/en.lang
+++ b/languages/en.lang
@@ -246,7 +246,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Modifying the domain %s failed!';
 $PALANG['pAdminCreate_admin_welcome'] = 'Add a new domain admin';
 $PALANG['pAdminCreate_admin_username_text'] = 'Email address';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin is not a valid email address!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid';
+$PALANG['admin_already_exists'] = 'The admin already exists!';
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!';
 $PALANG['pAdminCreate_admin_button'] = 'Add Admin';
 $PALANG['pAdminCreate_admin_result_error'] = 'Adding the admin %s failed!';
 $PALANG['pAdminCreate_admin_result_success'] = 'The admin %s has been added!';
diff --git a/languages/es.lang b/languages/es.lang
index 0de63a6c..1aa696b2 100644
--- a/languages/es.lang
+++ b/languages/es.lang
@@ -240,7 +240,8 @@ $PALANG['pAdminEdit_domain_result_error'] = '¡Imposible modificar el dominio! (
 $PALANG['pAdminCreate_admin_welcome'] = 'Añadir un nuevo administrador de dominio';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-mail';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrador no es un e-mail válido!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'El administrador ya existe o no es válido!';
+$PALANG['admin_already_exists'] = 'El administrador ya existe o no es válido!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 
 $PALANG['pAdminCreate_admin_button'] = 'Añadir administrador';
 $PALANG['pAdminCreate_admin_result_error'] = '¡Imposible añadir el administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
diff --git a/languages/et.lang b/languages/et.lang
index ca853e9f..6c846541 100644
--- a/languages/et.lang
+++ b/languages/et.lang
@@ -239,7 +239,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Domeeni muutmine ebaõnnestus! (%s)
 $PALANG['pAdminCreate_admin_welcome'] = 'Lisa uus domeeni haldaja';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-posti aadress';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Väljal haldaja pole kehtiv e-posti aadress!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Selline haldaja on juba olemas';
+$PALANG['admin_already_exists'] = 'Selline haldaja on juba olemas'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Lisa haldaja';
 $PALANG['pAdminCreate_admin_result_error'] = 'Haldaja lisamine ebaõnnestus! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Haldaja on lisatud! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/eu.lang b/languages/eu.lang
index e3359fec..87ecf931 100644
--- a/languages/eu.lang
+++ b/languages/eu.lang
@@ -237,7 +237,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Ezinezkoa domeinua aldatzea! (%s)';
 $PALANG['pAdminCreate_admin_welcome'] = 'Domeinu kudeatzaile berri bat gehitu';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-mail helbidea';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Kudeatzaile e-mailak ez du balio!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Kudeatzailea existitzen da edo ez du balio!';
+$PALANG['admin_already_exists'] = 'Kudeatzailea existitzen da edo ez du balio!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 
 $PALANG['pAdminCreate_admin_button'] = 'Kudeatzailea gehitu';
 $PALANG['pAdminCreate_admin_result_error'] = 'Ezinezkoa kudeatzailea gehitzea! (%s)'; # XXX Text changed to: Adding the admin %s failed!
diff --git a/languages/fi.lang b/languages/fi.lang
index 5bda38a2..ea86e146 100644
--- a/languages/fi.lang
+++ b/languages/fi.lang
@@ -239,7 +239,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Domainin muokkaus ei onnistu! (%s)'
 $PALANG['pAdminCreate_admin_welcome'] = 'Lisää uusi domainin ylläpitäjä';
 $PALANG['pAdminCreate_admin_username_text'] = 'Sähköpostiosoite';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Ylläpitäjän sähköpostiosoite ei ole oikeanmuotoinen!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Ylläpitäjän sähköpostiosoite on jo olemassa tai se ei ole oikean muotoinen';
+$PALANG['admin_already_exists'] = 'Ylläpitäjän sähköpostiosoite on jo olemassa tai se ei ole oikean muotoinen'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Lisää ylläpitäjä';
 $PALANG['pAdminCreate_admin_result_error'] = 'Ylläpitäjän lisäys ei onnistu! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Ylläpitäjä on lisätty! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/fo.lang b/languages/fo.lang
index 2c9144b5..91b40040 100644
--- a/languages/fo.lang
+++ b/languages/fo.lang
@@ -239,7 +239,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Fái ikki broytt navnaøki! (%s)';
 $PALANG['pAdminCreate_admin_welcome'] = 'Stovna navnaøki umsitara';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-post adressa';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Umsitari er ógyldug e-post adressa!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Umsitari finst longu ella er ógyldugur';
+$PALANG['admin_already_exists'] = 'Umsitari finst longu ella er ógyldugur'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Stovna umsitara';
 $PALANG['pAdminCreate_admin_result_error'] = 'Fái ikki stovnað umsitara! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Umsitari er stovnaður! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/fr.lang b/languages/fr.lang
index 7042eb53..674df526 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -241,7 +241,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Impossible de modifier le domain! (
 $PALANG['pAdminCreate_admin_welcome'] = 'Ajouter un nouvel administrateur de domaine';
 $PALANG['pAdminCreate_admin_username_text'] = 'adresse courriel';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Ce n\'est pas une adresse courriel administrateur valide!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Cet adresse courriel administrateur existe déjà ou n\'est pas valide';
+$PALANG['admin_already_exists'] = 'Cet adresse courriel administrateur existe déjà ou n\'est pas valide'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Ajouter un administrateur';
 $PALANG['pAdminCreate_admin_result_error'] = 'Impossible d\'ajouter un administrateur! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'L\'administrateur a été ajouté! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/hr.lang b/languages/hr.lang
index 9c3ff925..cc907046 100644
--- a/languages/hr.lang
+++ b/languages/hr.lang
@@ -238,7 +238,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Domenu nije bilo moguće premeniti!
 $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj administratora domene';
 $PALANG['pAdminCreate_admin_username_text'] = 'Adresa e-pošte';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator nije valjana adresa e-pošte!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Adminstrator već postoji ili nije valjan';
+$PALANG['admin_already_exists'] = 'Adminstrator već postoji ili nije valjan'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Dodaj administratora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Administratora nije bilo moguće dodati! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je uspješno dodan (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/hu.lang b/languages/hu.lang
index 9f27ec0d..db302d43 100644
--- a/languages/hu.lang
+++ b/languages/hu.lang
@@ -245,7 +245,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'A domain módosítása sikertelen!
 $PALANG['pAdminCreate_admin_welcome'] = 'Új domain admin felvétele';
 $PALANG['pAdminCreate_admin_username_text'] = 'Email cím';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Az Admin nem valós email cím!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Az Admin már létezik, vagy nem valós a cím!';
+$PALANG['admin_already_exists'] = 'Az Admin már létezik, vagy nem valós a cím!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Admin felvétele';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nemsikerült az Admint felvenni! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Az Admin sikeresen bekerült az adatbázisba! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/is.lang b/languages/is.lang
index 5b53d992..1cbaee89 100644
--- a/languages/is.lang
+++ b/languages/is.lang
@@ -239,7 +239,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Get ekki breytt léni! (%s)'; # XXX
 $PALANG['pAdminCreate_admin_welcome'] = 'Bæta nýju léni við';
 $PALANG['pAdminCreate_admin_username_text'] = 'Póstfang';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Kerfisstjóri er ekki rétt póstfang!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Kerfisstjóri er til nú þegar eða er ekki leyfilegt';
+$PALANG['admin_already_exists'] = 'Kerfisstjóri er til nú þegar eða er ekki leyfilegt'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Bæta við kerfisstjóra';
 $PALANG['pAdminCreate_admin_result_error'] = 'Get ekki bætt við kerfisstjóra! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Kerfisstjórinn hefur verið skráður! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/it.lang b/languages/it.lang
index b6941e44..5ee0d2d9 100644
--- a/languages/it.lang
+++ b/languages/it.lang
@@ -240,7 +240,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Impossibile modificare il dominio!
 $PALANG['pAdminCreate_admin_welcome'] = 'Aggiungi un nuovo amministratore per il dominio';
 $PALANG['pAdminCreate_admin_username_text'] = 'Indirizzo email';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'L\'indirizzo dell\'amministratore non è valido!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'L\'amministratore esiste di già, oppure non è valido';
+$PALANG['admin_already_exists'] = 'L\'amministratore esiste di già, oppure non è valido'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Aggiungi amministratore';
 $PALANG['pAdminCreate_admin_result_error'] = 'Impossibile aggiungere amministratore! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'L\'amministratore è stato aggiunto! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/ja.lang b/languages/ja.lang
index 559fed8a..062a8fbc 100644
--- a/languages/ja.lang
+++ b/languages/ja.lang
@@ -245,7 +245,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'ドメインが修正できませ
 $PALANG['pAdminCreate_admin_welcome'] = '新しいドメイン管理者の追加';
 $PALANG['pAdminCreate_admin_username_text'] = 'メールアドレス';
 $PALANG['pAdminCreate_admin_username_text_error1'] = '管理者は有効なメールアドレスではありません。';
-$PALANG['pAdminCreate_admin_username_text_error2'] = '管理者は存在するか無効です。';
+$PALANG['admin_already_exists'] = '管理者は存在するか無効です。'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = '管理者追加';
 $PALANG['pAdminCreate_admin_result_error'] = '管理者を追加できません！ (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = '管理者を追加しました。 (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/lt.lang b/languages/lt.lang
index 2c3297a5..d239e4a7 100644
--- a/languages/lt.lang
+++ b/languages/lt.lang
@@ -240,7 +240,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Srities pakeisti nepavyko! (%s)'; #
 $PALANG['pAdminCreate_admin_welcome'] = 'Registruoti naują srities administratorių';
 $PALANG['pAdminCreate_admin_username_text'] = 'El.pašto adresas';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administratorius turi būti el.pašto adresas!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratorius šiai sričiai jau yra arba neteisingas';
+$PALANG['admin_already_exists'] = 'Administratorius šiai sričiai jau yra arba neteisingas'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Registruoti administratorių';
 $PALANG['pAdminCreate_admin_result_error'] = 'Administratoriaus užregistruoti nepavyko! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratorius užregistruotas! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/mk.lang b/languages/mk.lang
index 194d183f..30a400f8 100644
--- a/languages/mk.lang
+++ b/languages/mk.lang
@@ -240,7 +240,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Не можам да го моди
 $PALANG['pAdminCreate_admin_welcome'] = 'Додади нов администратор на домен';
 $PALANG['pAdminCreate_admin_username_text'] = 'Email адреса';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Администратор не е валидна адреса!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Администраторот веќе постои или не е валидна';
+$PALANG['admin_already_exists'] = 'Администраторот веќе постои или не е валидна'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Додади Администратор';
 $PALANG['pAdminCreate_admin_result_error'] = 'Не можам да додадам администратор! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Администраторот е додаден! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/nb.lang b/languages/nb.lang
index 7cf69705..a14667f7 100644
--- a/languages/nb.lang
+++ b/languages/nb.lang
@@ -240,7 +240,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Kunne ikke endre domenet! (%s)'; #
 $PALANG['pAdminCreate_admin_welcome'] = 'Legg til en ny domeneadministrator';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Du har ikke skrevet inn en gyldig e-postadresse!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administratoren er allerede definert, eller du har skrevet inn en ugyldig adresse';
+$PALANG['admin_already_exists'] = 'Administratoren er allerede definert, eller du har skrevet inn en ugyldig adresse'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
 $PALANG['pAdminCreate_admin_result_error'] = 'Kunne ikke legge til administratoren! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/nl.lang b/languages/nl.lang
index 473f02e6..dfdd236e 100644
--- a/languages/nl.lang
+++ b/languages/nl.lang
@@ -240,7 +240,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Mislukt het domein te bewerken. (%s
 $PALANG['pAdminCreate_admin_welcome'] = 'Voeg een nieuw domein beheerder toe';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-mail adres';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Beheerder is geen geldig e-mail adres!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'De beheerder bestaat al of is niet geldig';
+$PALANG['admin_already_exists'] = 'De beheerder bestaat al of is niet geldig'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Voeg beheerder toe';
 $PALANG['pAdminCreate_admin_result_error'] = 'Mislukt om beheerder toe te voegen! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Beheerder is toegevoegd. (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/nn.lang b/languages/nn.lang
index e9b80c6e..607f3ffe 100644
--- a/languages/nn.lang
+++ b/languages/nn.lang
@@ -239,7 +239,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Klarte ikke å oppdatere domenet! (
 $PALANG['pAdminCreate_admin_welcome'] = 'Legg til ny domene-administrator';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator er ikke gyldig adresse!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'The admin already exists or is not valid'; # XXX
+$PALANG['admin_already_exists'] = 'The admin already exists!'; # XXX
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
 $PALANG['pAdminCreate_admin_result_error'] = 'Klarte ikke å legge til administratoren! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/pl.lang b/languages/pl.lang
index 928824be..36e8ab1f 100644
--- a/languages/pl.lang
+++ b/languages/pl.lang
@@ -242,7 +242,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Nie można zmodyfikować domeny! (%
 $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj konto administratora';
 $PALANG['pAdminCreate_admin_username_text'] = 'Adres email';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administartor nie jest poprawnym adresem email!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administrator już istnieje lub jest niepoprawny';
+$PALANG['admin_already_exists'] = 'Administrator już istnieje lub jest niepoprawny'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Dodaj administratora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nie można dodać administratora! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrator został dodany! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/pt-br.lang b/languages/pt-br.lang
index 3892b00e..e2346306 100644
--- a/languages/pt-br.lang
+++ b/languages/pt-br.lang
@@ -247,7 +247,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Não foi possível editar o domíni
 $PALANG['pAdminCreate_admin_welcome'] = 'Criação de um novo administrador de domínio.';
 $PALANG['pAdminCreate_admin_username_text'] = 'Endereço de email';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Endereço de email inválido!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Administrador já existe ou é inválido';
+$PALANG['admin_already_exists'] = 'Administrador já existe ou é inválido'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Criar Administrador';
 $PALANG['pAdminCreate_admin_result_error'] = 'Não foi possível criar o administrador! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrador criado! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/ru.lang b/languages/ru.lang
index f9678066..aa490a68 100644
--- a/languages/ru.lang
+++ b/languages/ru.lang
@@ -247,7 +247,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Невозможно изменит
 $PALANG['pAdminCreate_admin_welcome'] = 'Добавление нового администратора домена';
 $PALANG['pAdminCreate_admin_username_text'] = 'Почтовый адрес';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Некорректный адрес администратора!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Администратор уже существует либо некорректное имя';
+$PALANG['admin_already_exists'] = 'Администратор уже существует либо некорректное имя'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Добавить администратора';
 $PALANG['pAdminCreate_admin_result_error'] = 'Невозможно добавить администратора! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Администратор был добавлен! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/sk.lang b/languages/sk.lang
index 629ced4e..baa3ed43 100644
--- a/languages/sk.lang
+++ b/languages/sk.lang
@@ -240,7 +240,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Nepodarilo sa upraviť doménu! (%s
 $PALANG['pAdminCreate_admin_welcome'] = 'Pridať nového administrátora';
 $PALANG['pAdminCreate_admin_username_text'] = 'Emailová adresa';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Táto adresa nie je platná!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Takáto adresa už existuje!';
+$PALANG['admin_already_exists'] = 'Takáto adresa už existuje!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Vytvoriť administrátora';
 $PALANG['pAdminCreate_admin_result_error'] = 'Nepodarilo sa pridať administrátora! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Administrátor bol pridaný! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/sl.lang b/languages/sl.lang
index c5a28cc0..45bd8119 100644
--- a/languages/sl.lang
+++ b/languages/sl.lang
@@ -239,7 +239,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Domene ni bilo mogoče spremeniti!
 $PALANG['pAdminCreate_admin_welcome'] = 'Dodaj domenskega administratorja';
 $PALANG['pAdminCreate_admin_username_text'] = 'E-poštni naslov';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Administrator ni veljaven e-poštni naslov!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Adminstrator že obstaja ali pa ni pravilen';
+$PALANG['admin_already_exists'] = 'Adminstrator že obstaja ali pa ni pravilen'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Dodaj administratorja';
 $PALANG['pAdminCreate_admin_result_error'] = 'Administratorja ni bilo mogoče dodati! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Admininstrator je bil uspešno dodan (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/sv.lang b/languages/sv.lang
index 2a657c33..f3f8bec3 100644
--- a/languages/sv.lang
+++ b/languages/sv.lang
@@ -241,7 +241,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Kan inte modifiera domänen! (%s)';
 $PALANG['pAdminCreate_admin_welcome'] = 'Lägg till ny domänadmin';
 $PALANG['pAdminCreate_admin_username_text'] = 'Epostadress';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Admin är inte en giltig epostadress!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Denna admin finns redan eller är inte giltig';
+$PALANG['admin_already_exists'] = 'Denna admin finns redan eller är inte giltig'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Lägg till admin';
 $PALANG['pAdminCreate_admin_result_error'] = 'Kan inte lägga till admin! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Admin har lagts till! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/tr.lang b/languages/tr.lang
index 385db343..6e076ba3 100644
--- a/languages/tr.lang
+++ b/languages/tr.lang
@@ -239,7 +239,8 @@ $PALANG['pAdminEdit_domain_result_error'] = 'Domain düzenlenemedi! (%s)'; # XXX
 $PALANG['pAdminCreate_admin_welcome'] = 'Yöneticiye yeni bir domain ekle';
 $PALANG['pAdminCreate_admin_username_text'] = 'Eposta adresi';
 $PALANG['pAdminCreate_admin_username_text_error1'] = 'Yönetici uygun bir eposta adresi deðil!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = 'Yönetici halen bulunmakta ya da uygun deðil';
+$PALANG['admin_already_exists'] = 'Yönetici halen bulunmakta ya da uygun deðil'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = 'Yönetici ekle';
 $PALANG['pAdminCreate_admin_result_error'] = 'Yönetici eklenemiyor! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = 'Yönetici eklendi! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/languages/tw.lang b/languages/tw.lang
index d6a556eb..397a3a8b 100644
--- a/languages/tw.lang
+++ b/languages/tw.lang
@@ -239,7 +239,8 @@ $PALANG['pAdminEdit_domain_result_error'] = '修改網域失敗! (%s)'; # XXX Te
 $PALANG['pAdminCreate_admin_welcome'] = '新增網域管理員';
 $PALANG['pAdminCreate_admin_username_text'] = '郵件地址';
 $PALANG['pAdminCreate_admin_username_text_error1'] = '管理員名不是一個合法的郵件地址!';
-$PALANG['pAdminCreate_admin_username_text_error2'] = '管理員已經存在或者管理員名非法!';
+$PALANG['admin_already_exists'] = '管理員已經存在或者管理員名非法!'; # XXX Text changed to: The admin already exists!
+$PALANG['admin_does_not_exist'] = 'The admin does not exist!'; # XXX
 $PALANG['pAdminCreate_admin_button'] = '新增';
 $PALANG['pAdminCreate_admin_result_error'] = '新增管理員失敗! (%s)'; # XXX Text changed to: Adding the admin %s failed!
 $PALANG['pAdminCreate_admin_result_success'] = '新增管理員成功! (%s)'; # XXX Text changed to: The admin %s has been added.
diff --git a/model/AdminHandler.php b/model/AdminHandler.php
index 3f6a82fa..c9a21e1f 100644
--- a/model/AdminHandler.php
+++ b/model/AdminHandler.php
@@ -82,8 +82,8 @@ class AdminHandler extends PFAHandler {
     }
 
     protected function initMsg() {
-        $this->msg['error_already_exists'] = 'pAdminCreate_admin_username_text_error2'; # TODO: better error message
-        $this->msg['error_does_not_exist'] = 'pAdminEdit_admin_result_error'; # TODO: better error message
+        $this->msg['error_already_exists'] = 'admin_already_exists';
+        $this->msg['error_does_not_exist'] = 'admin_does_not_exist';
         if ($this->new) {
             $this->msg['logname'] = 'create_admin';
             $this->msg['store_error'] = 'pAdminCreate_admin_result_error';
diff --git a/model/AdminpasswordHandler.php b/model/AdminpasswordHandler.php
index e37da304..61cdbec5 100644
--- a/model/AdminpasswordHandler.php
+++ b/model/AdminpasswordHandler.php
@@ -50,8 +50,8 @@ class AdminpasswordHandler extends PFAHandler {
     }
 
     public function initMsg() {
-        $this->msg['error_already_exists'] = 'pAdminCreate_admin_username_text_error2'; # probably unused
-        $this->msg['error_does_not_exist'] = 'pAdminEdit_admin_result_error'; # probably unused
+        $this->msg['error_already_exists'] = 'admin_already_exists'; # probably unused
+        $this->msg['error_does_not_exist'] = 'admin_does_not_exist'; # probably unused
 
         $this->msg['logname'] = 'edit_password';
         $this->msg['store_error'] = 'pPassword_result_error';