From 7688bb33f138bca47b91312079ab76edc675d32b Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Tue, 7 Dec 2004 12:35:40 +0000
Subject: [PATCH] bug fixes + admin domain searching

---
 includes/account.php       |  12 +++
 includes/account_stuff.php |   9 ++-
 locale/da.po               | 151 +++++++++++++++++++++----------------
 locale/de.po               | 151 +++++++++++++++++++++----------------
 locale/es.po               | 151 +++++++++++++++++++++----------------
 locale/fr.po               | 150 ++++++++++++++++++++----------------
 locale/hu.po               | 151 +++++++++++++++++++++----------------
 locale/it.po               | 150 ++++++++++++++++++++----------------
 locale/nl.po               | 151 +++++++++++++++++++++----------------
 locale/pt.po               | 151 +++++++++++++++++++++----------------
 locale/pt_BR.po            | 151 +++++++++++++++++++++----------------
 locale/ru.po               | 150 ++++++++++++++++++++----------------
 locale/sv.po               | 150 ++++++++++++++++++++----------------
 locale/tr.po               | 151 +++++++++++++++++++++----------------
 locale/zh.po               | 151 +++++++++++++++++++++----------------
 messages.po                | 146 +++++++++++++++++++----------------
 pages/account/48.php       |  30 ++++++++
 pages/account/49.php       |  60 +++++++++++++++
 pages/index/4.php          |   3 +-
 www/index.php              |   2 +-
 20 files changed, 1321 insertions(+), 900 deletions(-)
 create mode 100644 pages/account/48.php
 create mode 100644 pages/account/49.php

diff --git a/includes/account.php b/includes/account.php
index 086ddec..c6d936e 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -1673,6 +1673,18 @@
 		unset($oldid);
 	}
 
+	if($oldid == 48 && $_POST['domain'] == "")
+	{
+		$id = $oldid;
+		unset($oldid);
+	}
+
+	if($oldid == 48)
+	{
+		$id = 49;
+		unset($oldid);
+	}
+
 	if($id == 44)
 	{
 		if($_GET['userid'] != "")
diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index 36bb2a2..4ecba58 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -76,7 +76,12 @@
 		case 35: $expand = " explode('orgadmin');"; break;
 		case 42:
 		case 43:
-		case 44: $expand = " explode('sysadmin');"; break;
+		case 44:
+		case 45:
+		case 46:
+		case 47:
+		case 48:
+		case 49: $expand = " explode('sysadmin');"; break;
 		case 500:
 		case 501:
 		case 502:
@@ -182,7 +187,7 @@ function hideall() {
 <? if($_SESSION['profile']['admin'] == 1) { ?>
     <div class="relatedLinks">
       <h3 onclick="explode('sysadmin')">+ <?=_("System Admin")?></h3>
-      <ul class="menu" id="sysadmin"><li><a href="account.php?id=42"><?=_("Find User")?></a></li></ul>
+      <ul class="menu" id="sysadmin"><li><a href="account.php?id=42"><?=_("Find User")?></a></li><li><a href="account.php?id=48"><?=_("Find Domain")?></a></li></ul>
     </div>
 <? } ?>
   </div>
diff --git a/locale/da.po b/locale/da.po
index 49cfbb5..925eb79 100644
--- a/locale/da.po
+++ b/locale/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CAcert\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-08-04 13:36+1000\n"
 "Last-Translator: Duane <duane@cacert.org>\n"
 "Language-Team: Duane <duane@cacert.org>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -76,7 +76,7 @@ msgid ""
 "sooner it can achieve the goals of the community."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "Om"
 
@@ -84,11 +84,11 @@ msgstr "Om"
 msgid "About CAcert.org"
 msgstr "Om CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "Om os"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -247,7 +247,7 @@ msgstr "Besked ved 
 msgid "Assurances Made"
 msgstr "Besked ved ændringer"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "Personlig information"
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "CAcert net af tillid"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "Bliv en notarius"
@@ -368,7 +368,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "CAcert.org support!"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "CAcert net af tillid"
 
@@ -500,7 +500,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Skift kodeord"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "Skift kodeord"
@@ -523,7 +523,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Klient certifikater"
 
@@ -552,8 +552,8 @@ msgid "CommonName"
 msgstr "CommonName"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "CommonName feltet var efterladt tomt. Kan ikke fortsætte."
 
@@ -597,7 +597,7 @@ msgstr "Kontakt email"
 msgid "Contact Email"
 msgstr "Kontakt email"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Kontakt os"
@@ -668,7 +668,7 @@ msgstr "F
 msgid "Default"
 msgstr "Standard"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 #, fuzzy
 msgid "Default Language"
 msgstr "Standard"
@@ -730,7 +730,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Domæne"
 
@@ -738,7 +739,7 @@ msgstr "Dom
 msgid "Domain Certificates"
 msgstr "Domæne certifikater"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Domæner"
@@ -748,7 +749,7 @@ msgstr "Dom
 msgid "Domains and Server Certificates."
 msgstr "Domæne certifikater"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Donationer"
@@ -770,7 +771,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Rediger"
@@ -785,7 +786,7 @@ msgstr "Rediger organisation"
 msgid "Email"
 msgstr "Email"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "Emailkonti"
 
@@ -795,7 +796,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "Klient certifikater"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "Email adresse"
 
@@ -899,12 +900,22 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Tilføj domæne"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 #, fuzzy
 msgid "Find User"
 msgstr "Bliv en notarius"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "Bliv en notarius"
+
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Find an Assurer"
 msgstr "Bliv en notarius"
@@ -965,7 +976,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "GPG nøgler"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "GPG/PGP nøgler"
 
@@ -997,7 +1008,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Gå til start"
 
@@ -1422,7 +1433,7 @@ msgstr "Position."
 msgid "Location Name"
 msgstr "Position."
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "Login"
 
@@ -1431,7 +1442,7 @@ msgstr "Login"
 msgid "Logos"
 msgstr "Log ud"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "Log ud"
 
@@ -1539,7 +1550,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Min konto"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr ""
 
@@ -1561,9 +1572,9 @@ msgstr ""
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1571,7 +1582,7 @@ msgstr ""
 msgid "My CAcert.org Account!"
 msgstr "Min CAcert.org konto!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Mine detajler"
@@ -1580,12 +1591,12 @@ msgstr "Mine detajler"
 msgid "My Language Settings"
 msgstr ""
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 #, fuzzy
 msgid "My Listing"
 msgstr "Position."
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 #, fuzzy
 msgid "My Location"
 msgstr "Position."
@@ -1602,9 +1613,9 @@ msgstr "I/T"
 msgid "Name"
 msgstr "Navn"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Ny"
 
@@ -1632,7 +1643,7 @@ msgstr "Nyt klient certifikat"
 msgid "New Domain for %s"
 msgstr "Nyt domæne for %s"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Ny organisation"
 
@@ -1659,8 +1670,8 @@ msgid "News"
 msgstr "Ny"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Næste"
 
@@ -1679,6 +1690,11 @@ msgstr "Intet navn"
 msgid "No domains are currently listed."
 msgstr "Ingen domæner er pt. listet."
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1689,7 +1705,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "Intet sådanne certifikat tilknyttet din konto."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -1812,7 +1828,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1820,11 +1836,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Org. administrator"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Org. klient certifikater"
 
@@ -1833,7 +1849,7 @@ msgstr "Org. klient certifikater"
 msgid "Org Client and Server Certificates"
 msgstr "Server certifikater"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Org. server certifikater"
 
@@ -1892,7 +1908,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "Kodeord"
 
@@ -2009,7 +2025,7 @@ msgstr "Opret certifikat foresp
 msgid "Privacy"
 msgstr "Privatoplysnings politik"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Privatoplysnings politik"
@@ -2088,7 +2104,7 @@ msgstr "Rod certifikat (DER format)"
 msgid "Root Certificate (PEM Format)"
 msgstr "Rod certifikat (PEM format)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "Regler"
 
@@ -2189,7 +2205,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2219,7 +2235,7 @@ msgstr "Send"
 msgid "Sensitive Information"
 msgstr "Personlig information"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Server certifikater"
 
@@ -2306,7 +2322,7 @@ msgstr "Send"
 msgid "Suffix"
 msgstr "Suffix"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2316,7 +2332,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "TTP Form"
 msgstr "WoT Formular"
@@ -2387,10 +2403,17 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "Kodeordet du sendte var for kort."
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "Kodeordet du sendte var for kort."
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2502,7 +2525,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -2582,7 +2605,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr ""
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2706,7 +2729,7 @@ msgstr "By/Forstad"
 msgid "Translations"
 msgstr "Oversættelser"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "Tredjeparter med tillid til"
 
@@ -2801,14 +2824,14 @@ msgstr "Bekr
 msgid "Verified Users"
 msgstr "Bekræftet"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Vis"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Vis organisationer"
 
@@ -2816,7 +2839,7 @@ msgstr "Vis organisationer"
 msgid "Warning!"
 msgstr "Advarsel!"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -2824,7 +2847,7 @@ msgid ""
 "exposing their account, personal details and identity theft as a result."
 msgstr ""
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -2964,7 +2987,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "WoT Form"
 msgstr "WoT Formular"
@@ -3304,7 +3327,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/de.po b/locale/de.po
index 5af330b..e01642a 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-10-25 17:10+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <de@li.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr "%s Zeilen angezeigt."
@@ -117,7 +117,7 @@ msgstr ""
 "Jeder Betrag ist willkommen - je mehr finanzielle Unterst&uuml;tzung CAcert "
 "bekommt, desto schneller k&ouml;nnen die Ziele der Community erreicht werden."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "&Uuml;ber"
 
@@ -125,11 +125,11 @@ msgstr "&Uuml;ber"
 msgid "About CAcert.org"
 msgstr "&Uuml;ber CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "&Uuml;ber uns"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -313,7 +313,7 @@ msgstr "Assurance Punkte, die Sie vergeben haben"
 msgid "Assurances Made"
 msgstr "Assurance Punkte"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "Jemanden best&auml;tigen"
@@ -342,7 +342,7 @@ msgstr "Werde Mitglied der CAcert Association"
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "Werde Assurer im CAcert Web of Trust"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "Ein Assurer werden"
@@ -462,7 +462,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "CAcert Support Team"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "CAcert Web of Trust"
 
@@ -607,7 +607,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Passwort &auml;ndern"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "Passwort &Auml;ndern"
@@ -632,7 +632,7 @@ msgstr "Klicken Sie hier, um zur Support-Mailingliste zu gelangen."
 msgid "Click here to view all lists available"
 msgstr "Klicken Sie hier, um alle verf&uuml;gbaren Mailinglisten anzuzeigen."
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Client Zertifikate"
 
@@ -661,8 +661,8 @@ msgid "CommonName"
 msgstr "Zertifikats-Name"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "Das Feld CommonName ist leer."
 
@@ -711,7 +711,7 @@ msgstr "Kontakt Details"
 msgid "Contact Email"
 msgstr "Kontakt E-Mail"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Kontakt"
@@ -784,7 +784,7 @@ msgstr "Geburtsdatum"
 msgid "Default"
 msgstr "Standard"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "Default Language"
 msgstr "Standardsprache"
 
@@ -856,7 +856,8 @@ msgstr ""
 "bestimmten Certification Authority zu installieren."
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Domain"
 
@@ -864,7 +865,7 @@ msgstr "Domain"
 msgid "Domain Certificates"
 msgstr "Domain Zertifikate"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Domains"
@@ -873,7 +874,7 @@ msgstr "Domains"
 msgid "Domains and Server Certificates."
 msgstr "Domains und Server-Zertifikate"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Spenden"
@@ -906,7 +907,7 @@ msgstr ""
 "konfigurieren Sie es so, dass es das soeben heruntergeladene Zertifikat "
 "benutzt. Einfach oder?"
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -921,7 +922,7 @@ msgstr "Bearbeite Organisation"
 msgid "Email"
 msgstr "E-Mail"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "E-Mail Konto"
 
@@ -930,7 +931,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "E-Mail Konten und Client-Zertifikate"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "E-Mail Adresse"
 
@@ -1051,11 +1052,21 @@ msgstr ""
 "Zum Schluss werden Sie nach 'extra' Eigenschaften gefragt. Diese Fragen "
 "k&ouml;nnen Sie einfach durch dr&uuml;cken der Enter-Taste &uuml;berspringen."
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Domain hinzuf&uuml;gen"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 msgid "Find User"
 msgstr "Finde Benutzer"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "Finde Benutzer"
+
+#: includes/account_stuff.php:181
 msgid "Find an Assurer"
 msgstr "Finde einen Assurer"
 
@@ -1123,7 +1134,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "GPG/PGP Schl&uuml;ssel"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "GPG/PGP Schl&uuml;ssel"
 
@@ -1164,7 +1175,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr "Erzeuge ein neues Schl&uuml;sselbar und einen CSR f&uuml;r IIS 5.0"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Gehe zur Startseite"
 
@@ -1677,7 +1688,7 @@ msgstr "Ort"
 msgid "Location Name"
 msgstr "Ort"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "Anmelden"
 
@@ -1686,7 +1697,7 @@ msgstr "Anmelden"
 msgid "Logos"
 msgstr "Abmelden"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -1812,7 +1823,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Mein Konto"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr "Meine Alarm Einstellungen"
 
@@ -1834,9 +1845,9 @@ msgstr "Meine Alarm Einstellungen"
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1844,7 +1855,7 @@ msgstr "Meine Alarm Einstellungen"
 msgid "My CAcert.org Account!"
 msgstr "Mein CAcert.org Konto!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Meine Details"
@@ -1853,11 +1864,11 @@ msgstr "Meine Details"
 msgid "My Language Settings"
 msgstr "Meine Sprach Einstellungen"
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "Mein Benutzerverzeichnis-Eintrag"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "Mein Standort"
 
@@ -1873,9 +1884,9 @@ msgstr "N/A"
 msgid "Name"
 msgstr "Name"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Neu"
 
@@ -1903,7 +1914,7 @@ msgstr "Neues Client-Zertifikat"
 msgid "New Domain for %s"
 msgstr "Neue Domain f&uuml;r %s"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Neue Organisation"
 
@@ -1930,8 +1941,8 @@ msgid "News"
 msgstr "Neu"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Weiter"
 
@@ -1954,6 +1965,11 @@ msgstr "Kein Name"
 msgid "No domains are currently listed."
 msgstr "Derzeit sind keine Domains gelistet."
 
+#: www/account/49.php:50
+#, fuzzy, php-format
+msgid "No domains found matching %s"
+msgstr "Es wurde kein passender Benutzer %s gefunden"
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1963,7 +1979,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "Kein solches Zertifikat ist mit Ihrem Konto verbunden."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr "Dieser Benutzer wurde nicht gefunden."
 
@@ -2124,7 +2140,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr "Nur die ersten 100 Zeilen werden angezeigt."
 
@@ -2132,11 +2148,11 @@ msgstr "Nur die ersten 100 Zeilen werden angezeigt."
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Org Admin"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Organisations Client Zertifikate"
 
@@ -2144,7 +2160,7 @@ msgstr "Organisations Client Zertifikate"
 msgid "Org Client and Server Certificates"
 msgstr "Organisations Client- und Server Zertifikate"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Organisations Server Zertifikate"
 
@@ -2204,7 +2220,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "Passphrase"
 
@@ -2344,7 +2360,7 @@ msgstr "Erstellen einer Zertifikat-Anfrage (CSR)"
 msgid "Privacy"
 msgstr "Datenschutzrichtlinien"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Datenschutzrichtlinien"
@@ -2422,7 +2438,7 @@ msgstr "Wurzelzertifikat (DER Format)"
 msgid "Root Certificate (PEM Format)"
 msgstr "Wurzelzertifikat (PEM Format)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "Regeln"
 
@@ -2556,7 +2572,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr "W&auml;hlen Sie eine Account Eigenschaft"
 
@@ -2586,7 +2602,7 @@ msgstr "Senden"
 msgid "Sensitive Information"
 msgstr "Kontakt Informationen"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Server Zertifikate"
 
@@ -2687,7 +2703,7 @@ msgstr "Abschicken"
 msgid "Suffix"
 msgstr "Suffix"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr "System Administrator"
 
@@ -2699,7 +2715,7 @@ msgstr ""
 "Das System wird Ihnen eine E-Mail mit einem Link senden. &Ouml;ffnen Sie "
 "diesen Link mit einem Webbrowser."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr "TTP Formular"
 
@@ -2794,10 +2810,17 @@ msgstr ""
 "Namen einer Abteilung oder einen Hinweis auf weitere Informationen benutzt "
 "wird."
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "Das Passwort das Sie angegeben haben ist zu kurz."
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "Das Passwort das Sie angegeben haben ist zu kurz."
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2950,7 +2973,7 @@ msgstr ""
 "&uuml;bernommen. Der Autor h&auml;lt das uneingeschr&auml;nkte Copyright "
 "(Name auf eigenen Wunsch nicht angegeben)."
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr "Das Passwort f&uuml;r %s wurde erfolgreich aktualisiert."
@@ -3070,7 +3093,7 @@ msgid "There was an error and I couldn't proceed"
 msgstr ""
 "Es ist leider ein Fehler aufgetreten und der Vorgang wurde daher abgebrochen."
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -3232,7 +3255,7 @@ msgstr "Stadt/Stadtteil"
 msgid "Translations"
 msgstr "&Uuml;bersetzungen"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "Vertrauensw&uuml;rdige Dritte (TTP)"
 
@@ -3328,14 +3351,14 @@ msgstr "Verifiziert"
 msgid "Verified Users"
 msgstr "Verifiziert"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Anzeigen"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Zeige Organisationen"
 
@@ -3343,7 +3366,7 @@ msgstr "Zeige Organisationen"
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -3357,7 +3380,7 @@ msgstr ""
 "an andere Personen weitergeben und damit Ihren Zugang und Ihre Pers&ouml;"
 "nlichen Daten gef&auml;hrden."
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -3525,7 +3548,7 @@ msgstr ""
 "Root-Zertifikate kompromittiert w&uuml;rde, dann k&ouml;nnte man es einfach "
 "widerrufen und neu erstellen ..."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "WoT Formular"
 
@@ -3952,7 +3975,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/es.po b/locale/es.po
index 55e2319..8e0ef8e 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CAcert\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-10-26 00:16+0100\n"
 "Last-Translator: Roberto <roberto@ryesoft.com>\n"
 "Language-Team:  Duane <duane@cacert.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -92,7 +92,7 @@ msgstr ""
 "CUALQUIER cantidad será bienvenida. Cuantos más fondos reciba CAcert, antes "
 "se alcanzarán las metas de la comunidad."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "Acerca de"
 
@@ -100,11 +100,11 @@ msgstr "Acerca de"
 msgid "About CAcert.org"
 msgstr "Acerca de CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "Acerca de nosotros"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -269,7 +269,7 @@ msgstr "Puntos que ha Emitido"
 msgid "Assurances Made"
 msgstr "Puntos Máximos"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "Autorizar a Alguien"
@@ -298,7 +298,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "Anillo de Confianza CAcert"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "Convertirse en Notario"
@@ -402,7 +402,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "Equipo de Soporte CAcert"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "Anillo de Confianza CAcert"
 
@@ -537,7 +537,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Cambiar Contraseña"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "Cambiar Contraseña"
@@ -560,7 +560,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Certificado de Cliente"
 
@@ -589,8 +589,8 @@ msgid "CommonName"
 msgstr "CommonName"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "El campo CommonName estaba en blanco. No se puede continuar."
 
@@ -638,7 +638,7 @@ msgstr "Datos de Contacto"
 msgid "Contact Email"
 msgstr "E-Mail de Contacto"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Contacte con nosotros"
@@ -706,7 +706,7 @@ msgstr "Fecha de Nacimiento"
 msgid "Default"
 msgstr "Predeterminado"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "Default Language"
 msgstr "Idioma Predeterminado"
 
@@ -767,7 +767,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Dominio"
 
@@ -775,7 +776,7 @@ msgstr "Dominio"
 msgid "Domain Certificates"
 msgstr "Certificados de Dominio"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Dominios"
@@ -784,7 +785,7 @@ msgstr "Dominios"
 msgid "Domains and Server Certificates."
 msgstr "Dominios y Certificados de Servidor"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Donaciones"
@@ -808,7 +809,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Editar"
@@ -823,7 +824,7 @@ msgstr "Editar Organizaci
 msgid "Email"
 msgstr "E-Mail"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "Cuentas E-Mail"
 
@@ -832,7 +833,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "Cuentas E-Mail y Certificados de Cliente"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "Dirección E-Mail"
 
@@ -937,12 +938,22 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Agregar Dominio"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 #, fuzzy
 msgid "Find User"
 msgstr "Convertirse en Notario"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "Convertirse en Notario"
+
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Find an Assurer"
 msgstr "Convertirse en Notario"
@@ -1002,7 +1013,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "Claves GPG/PGP"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "Claves GPG/PGP"
 
@@ -1034,7 +1045,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Ir a Página Inicial"
 
@@ -1512,7 +1523,7 @@ msgstr "Ubicaci
 msgid "Location Name"
 msgstr "Nombre de Ubicación"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "Entrar"
 
@@ -1521,7 +1532,7 @@ msgstr "Entrar"
 msgid "Logos"
 msgstr "Desconectar"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "Desconectar"
 
@@ -1629,7 +1640,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Mi Cuenta"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr "Mi Configuración de Alertas"
 
@@ -1651,9 +1662,9 @@ msgstr "Mi Configuraci
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1661,7 +1672,7 @@ msgstr "Mi Configuraci
 msgid "My CAcert.org Account!"
 msgstr "Mi cuenta CAcert.org!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Mis Datos"
@@ -1670,11 +1681,11 @@ msgstr "Mis Datos"
 msgid "My Language Settings"
 msgstr "Mi Configuración de Idioma"
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "Mi Directorio"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "Mi Ubicación"
 
@@ -1690,9 +1701,9 @@ msgstr "N/A"
 msgid "Name"
 msgstr "Nombre"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Nuevo"
 
@@ -1720,7 +1731,7 @@ msgstr "Nuevo Certificado de Cliente"
 msgid "New Domain for %s"
 msgstr "Nuevo Dominio para %s"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Nueva Organización"
 
@@ -1747,8 +1758,8 @@ msgid "News"
 msgstr "Nuevo"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Siguiente"
 
@@ -1767,6 +1778,11 @@ msgstr "Sin Nombre"
 msgid "No domains are currently listed."
 msgstr "No hay dominios en la lista."
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1776,7 +1792,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "El certificado no está asociado a su cuenta."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -1905,7 +1921,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1913,11 +1929,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Admin. Org."
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Certif. Cliente Org"
 
@@ -1925,7 +1941,7 @@ msgstr "Certif. Cliente Org"
 msgid "Org Client and Server Certificates"
 msgstr "Clientes Org y Certificados de Servidor"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Certif. de Servidor Org."
 
@@ -1985,7 +2001,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "Contraseña"
 
@@ -2103,7 +2119,7 @@ msgstr "Crear una Solicitud de Certificado"
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Política de Privacidad"
@@ -2181,7 +2197,7 @@ msgstr "Certificado Ra
 msgid "Root Certificate (PEM Format)"
 msgstr "Certificado Raíz (Formato PEM)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "Reglas"
 
@@ -2282,7 +2298,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2312,7 +2328,7 @@ msgstr "Enviar"
 msgid "Sensitive Information"
 msgstr "Información de Contacto"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Certificados de Servidor"
 
@@ -2401,7 +2417,7 @@ msgstr "Enviar"
 msgid "Suffix"
 msgstr "Sufijo"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2411,7 +2427,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr "Formulario TTP"
 
@@ -2484,10 +2500,17 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "La Contraseña que ha indicado es demasiado corta."
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "La Contraseña que ha indicado es demasiado corta."
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2629,7 +2652,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -2714,7 +2737,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr "Se ha producido un error. Imposible continuar."
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2838,7 +2861,7 @@ msgstr "Municipio/Suburbio"
 msgid "Translations"
 msgstr "Traducciones"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "Terceros de Confianza"
 
@@ -2933,14 +2956,14 @@ msgstr "Verificado"
 msgid "Verified Users"
 msgstr "Verificado"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Ver"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Ver Organizaciones"
 
@@ -2948,7 +2971,7 @@ msgstr "Ver Organizaciones"
 msgid "Warning!"
 msgstr "¡Atención!"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -2961,7 +2984,7 @@ msgstr ""
 "identificador de sesión exponiendo la seguridad de su cuenta, el acceso a "
 "sus datos personales o suplantar su identidad."
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -3104,7 +3127,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "Formulario WoT"
 
@@ -3478,7 +3501,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/fr.po b/locale/fr.po
index 9c64dcb..5e94c67 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreSSL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-10-23 00:13+0100\n"
 "Last-Translator: Laurent Cottereau <clark@minet.net>\n"
 "Language-Team: multiple <clark@minet.net>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -93,7 +93,7 @@ msgstr ""
 "N'IMPORTE quelle somme sera appréciée - plus CAcert reçoit de dons, et plus "
 "tôt les buts de la communauté seront atteints."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "A propos"
 
@@ -102,11 +102,11 @@ msgstr "A propos"
 msgid "About CAcert.org"
 msgstr "A propos de LibreSSL.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "A notre sujet"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -267,7 +267,7 @@ msgstr "Avis de modifications"
 msgid "Assurances Made"
 msgstr "Avis de modifications"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "Informations personnelles"
@@ -296,7 +296,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "La toile de confiance de CAcert"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "Devenir Notaire"
@@ -398,7 +398,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "L'équipe d'aide de CAcert"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "La toile de confiance de CAcert"
 
@@ -535,7 +535,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Modifier le mot de passe"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "Changement du Mot de Passe"
@@ -558,7 +558,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Certificats Client"
 
@@ -587,8 +587,8 @@ msgid "CommonName"
 msgstr "Nom commun (CommonName)"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "Le champ Nom Usuel (CommonName) était vide. Ne peut pas continuer."
 
@@ -639,7 +639,7 @@ msgstr "Contactez-nous"
 msgid "Contact Email"
 msgstr "Email de contact"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Contactez-nous"
@@ -709,7 +709,7 @@ msgstr "Date de naissance"
 msgid "Default"
 msgstr "Défaut"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "Default Language"
 msgstr "Langage par défaut"
 
@@ -770,7 +770,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Domaine"
 
@@ -778,7 +779,7 @@ msgstr "Domaine"
 msgid "Domain Certificates"
 msgstr "Certificats de domaines"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Domaines"
@@ -788,7 +789,7 @@ msgstr "Domaines"
 msgid "Domains and Server Certificates."
 msgstr "Certificats de domaines"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Dons"
@@ -812,7 +813,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Modifier"
@@ -827,7 +828,7 @@ msgstr "Modifier l'Organisme"
 msgid "Email"
 msgstr "Email"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "Comptes mail"
 
@@ -837,7 +838,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "Nouveau certificat client"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "Adresse email"
 
@@ -941,12 +942,22 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Ajouter un Domaine"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 #, fuzzy
 msgid "Find User"
 msgstr "Devenir Notaire"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "Devenir Notaire"
+
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Find an Assurer"
 msgstr "Devenir Notaire"
@@ -1007,7 +1018,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "Clés GPG"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "Clés GPG/PGP"
 
@@ -1039,7 +1050,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Aller à l'Accueil"
 
@@ -1498,7 +1509,7 @@ msgstr "Ville"
 msgid "Location Name"
 msgstr "Ville"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "Login"
 
@@ -1507,7 +1518,7 @@ msgstr "Login"
 msgid "Logos"
 msgstr "Login"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr ""
 
@@ -1622,7 +1633,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Mon compte"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr ""
 
@@ -1644,9 +1655,9 @@ msgstr ""
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1655,7 +1666,7 @@ msgstr ""
 msgid "My CAcert.org Account!"
 msgstr "Mon compte LibreSSL.org!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Mes détails"
@@ -1664,12 +1675,12 @@ msgstr "Mes détails"
 msgid "My Language Settings"
 msgstr ""
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 #, fuzzy
 msgid "My Listing"
 msgstr "Ville"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 #, fuzzy
 msgid "My Location"
 msgstr "Ville"
@@ -1686,9 +1697,9 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr ""
 
@@ -1716,7 +1727,7 @@ msgstr "Nouveau certificat client"
 msgid "New Domain for %s"
 msgstr "Supprimer le domaine de '%s'"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 #, fuzzy
 msgid "New Organisation"
 msgstr "Organisation"
@@ -1743,8 +1754,8 @@ msgid "News"
 msgstr ""
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Suivant"
 
@@ -1765,6 +1776,11 @@ msgstr "Votre nom"
 msgid "No domains are currently listed."
 msgstr "Aucun domaine n'est actuellement enregistré."
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1774,7 +1790,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "Aucun certificat équivalant n'est attaché à votre compte."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -1900,7 +1916,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1908,12 +1924,12 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 #, fuzzy
 msgid "Org Admin"
 msgstr "Admins"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 #, fuzzy
 msgid "Org Client Certs"
 msgstr "Certificats Client"
@@ -1923,7 +1939,7 @@ msgstr "Certificats Client"
 msgid "Org Client and Server Certificates"
 msgstr "Nouveau certificat client"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 #, fuzzy
 msgid "Org Server Certs"
 msgstr "Nouveau certificat client"
@@ -1986,7 +2002,7 @@ msgid ""
 msgstr ""
 
 # What's the difference between "password" or "Pass Phrase" ?
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "Mot de passe"
 
@@ -2103,7 +2119,7 @@ msgstr "Requête de Création de Certificat"
 msgid "Privacy"
 msgstr "Règles de confidentialité"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Règles de confidentialité"
@@ -2184,7 +2200,7 @@ msgstr "Certificat racine (format DER)"
 msgid "Root Certificate (PEM Format)"
 msgstr "Certificat racine (format PEM)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr ""
 
@@ -2285,7 +2301,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2315,7 +2331,7 @@ msgstr "Envoyer"
 msgid "Sensitive Information"
 msgstr "Informations personnelles"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 #, fuzzy
 msgid "Server Certificates"
 msgstr "Certificats de domaines"
@@ -2405,7 +2421,7 @@ msgstr "Envoyer"
 msgid "Suffix"
 msgstr "Suffixe"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2415,7 +2431,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr ""
 
@@ -2482,10 +2498,16 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr ""
 
+#: www/index.php:95
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr ""
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2590,7 +2612,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -2670,7 +2692,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr ""
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2795,7 +2817,7 @@ msgstr ""
 msgid "Translations"
 msgstr "Organisation"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr ""
 
@@ -2888,14 +2910,14 @@ msgstr ""
 msgid "Verified Users"
 msgstr "Devenir Notaire"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr ""
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 #, fuzzy
 msgid "View Organisations"
 msgstr "Modifier l'Organisme"
@@ -2904,7 +2926,7 @@ msgstr "Modifier l'Organisme"
 msgid "Warning!"
 msgstr ""
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -2912,7 +2934,7 @@ msgid ""
 "exposing their account, personal details and identity theft as a result."
 msgstr ""
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -3061,7 +3083,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr ""
 
@@ -3378,7 +3400,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/hu.po b/locale/hu.po
index 7c53339..8fbd8dc 100644
--- a/locale/hu.po
+++ b/locale/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CACert\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-10-13 16:46+0100\n"
 "Last-Translator: Levente Farkas <lfarkas@lfarkas.org>\n"
 "Language-Team: Hungarian <lfarkas@lfarkas.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -90,7 +90,7 @@ msgstr ""
 "B�RMENNYIT szivesen fogadunk - minél több támogatást kap a CAcert, annál "
 "hamarabb érhetjük el a közösség céljait."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "Névjegy"
 
@@ -98,11 +98,11 @@ msgstr "Névjegy"
 msgid "About CAcert.org"
 msgstr "A CAcert.org-ról"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "Rólunk"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -263,7 +263,7 @@ msgstr "Hitelesítési pontok"
 msgid "Assurances Made"
 msgstr "Hitelesítési pontok"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "Hitelsít valakit"
@@ -292,7 +292,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "CAcert webes hitelesítés"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "Közjegyzővé válik"
@@ -396,7 +396,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "CAcert támogató csapat"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "CAcert webes hitelesítés"
 
@@ -532,7 +532,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "A jelszó meg#xe1;ltoztatása"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "A jelszó megváltoztatása"
@@ -555,7 +555,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Kliens oldali tanúsítványok"
 
@@ -584,8 +584,8 @@ msgid "CommonName"
 msgstr "�ltalánosNév"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "�ltalánosNév mezõ üres volt. Nem tudom folytatni."
 
@@ -633,7 +633,7 @@ msgstr "Kapcsolat jellemzők"
 msgid "Contact Email"
 msgstr "Kapcsolattartó e-mail címe"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Kapcsolatfelvétel"
@@ -701,7 +701,7 @@ msgstr "Születési dátum"
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 #, fuzzy
 msgid "Default Language"
 msgstr "Alapértelmezett"
@@ -763,7 +763,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Domain"
 
@@ -771,7 +772,7 @@ msgstr "Domain"
 msgid "Domain Certificates"
 msgstr "Domain tanusítványok"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Domain-ek"
@@ -780,7 +781,7 @@ msgstr "Domain-ek"
 msgid "Domains and Server Certificates."
 msgstr "Domain és szerver tanusítványok"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Adományok"
@@ -804,7 +805,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Szerkesztés"
@@ -819,7 +820,7 @@ msgstr "Szervezet módosítása"
 msgid "Email"
 msgstr "Email"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "Email azonosítók"
 
@@ -828,7 +829,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "Email azonosítók és kliens tanusítványok"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "E-mail cím"
 
@@ -932,12 +933,22 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Domain hozzáadása"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 #, fuzzy
 msgid "Find User"
 msgstr "Közjegyzővé válik"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "Közjegyzővé válik"
+
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Find an Assurer"
 msgstr "Közjegyzővé válik"
@@ -997,7 +1008,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "GPG kulcsok"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "PGP/GPG kulcsok"
 
@@ -1029,7 +1040,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Kezdõlapra"
 
@@ -1501,7 +1512,7 @@ msgstr "Hely"
 msgid "Location Name"
 msgstr "Hely neve"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "Bejelentkezés"
 
@@ -1510,7 +1521,7 @@ msgstr "Bejelentkezés"
 msgid "Logos"
 msgstr "Kijelentkezés"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "Kijelentkezés"
 
@@ -1618,7 +1629,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Saját azonosító"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr "Figyelmeztető bejegyzéseim"
 
@@ -1640,9 +1651,9 @@ msgstr "Figyelmeztető bejegyzéseim"
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1650,7 +1661,7 @@ msgstr "Figyelmeztető bejegyzéseim"
 msgid "My CAcert.org Account!"
 msgstr "Az én CAcert.org azonosítóm!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Jellemzőim"
@@ -1660,11 +1671,11 @@ msgstr "Jellemzőim"
 msgid "My Language Settings"
 msgstr "Figyelmeztető bejegyzéseim"
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "Listáim"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "Helyeim"
 
@@ -1680,9 +1691,9 @@ msgstr "Nem elérhető"
 msgid "Name"
 msgstr "Név"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Új"
 
@@ -1710,7 +1721,7 @@ msgstr "Új kliens tanusítvány"
 msgid "New Domain for %s"
 msgstr "Új domain a '%s'-hoz"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Új szervezet"
 
@@ -1737,8 +1748,8 @@ msgid "News"
 msgstr "Új"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Következő"
 
@@ -1757,6 +1768,11 @@ msgstr "Névtelen"
 msgid "No domains are currently listed."
 msgstr "Nincsenek megjeleníthetõ tartományok."
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1766,7 +1782,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "Nincs ilyen tanúsítvány az Ön azonosítójához csatolva."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -1895,7 +1911,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1903,11 +1919,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Szervezet adminisztrátor"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Szervezet kliens tanusítványai"
 
@@ -1915,7 +1931,7 @@ msgstr "Szervezet kliens tanusítványai"
 msgid "Org Client and Server Certificates"
 msgstr "Szervezetek es szerver tanusítványok"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Szervezet szerver tanusítványai"
 
@@ -1974,7 +1990,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "Jelszó"
 
@@ -2092,7 +2108,7 @@ msgstr "Tanusítvány kérés készítése"
 msgid "Privacy"
 msgstr "Adatbiztonság"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Biztonsági házirend"
@@ -2170,7 +2186,7 @@ msgstr "A gyökértanúsítvány (DER formátumban)"
 msgid "Root Certificate (PEM Format)"
 msgstr "A gyökértanúsítvány (PEM formátumban)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "Szabályok"
 
@@ -2271,7 +2287,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2301,7 +2317,7 @@ msgstr "Küldés"
 msgid "Sensitive Information"
 msgstr "Kapcsolat információ"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Szerver tanúsítványok"
 
@@ -2390,7 +2406,7 @@ msgstr "Elküldés"
 msgid "Suffix"
 msgstr "Utótag"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2400,7 +2416,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr "TTP Å°rlap"
 
@@ -2469,10 +2485,17 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "A jelszó, amit megadott, túl rövid volt."
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "A jelszó, amit megadott, túl rövid volt."
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2606,7 +2629,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -2691,7 +2714,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr "Egy hiba lépett közbe ezért nem tudom folytatni"
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2816,7 +2839,7 @@ msgstr "Város/Városrész"
 msgid "Translations"
 msgstr "Fordítások"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "Megbízható harmadik személyek"
 
@@ -2911,14 +2934,14 @@ msgstr "Ellenőrzött"
 msgid "Verified Users"
 msgstr "Ellenőrzött"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Nézet"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Szervezetek megtekintése"
 
@@ -2926,7 +2949,7 @@ msgstr "Szervezetek megtekintése"
 msgid "Warning!"
 msgstr "Figyelmeztetés!"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -2934,7 +2957,7 @@ msgid ""
 "exposing their account, personal details and identity theft as a result."
 msgstr ""
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -3077,7 +3100,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "WoT Å°rlap"
 
@@ -3447,7 +3470,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/it.po b/locale/it.po
index 35ad125..3b7d866 100644
--- a/locale/it.po
+++ b/locale/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CAcert Web of Trust\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-10-30 13:14+0100\n"
 "Last-Translator: Roberto Passuello <roberto.passuello@elettra.trieste.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Poedit-Language: Italian\n"
 "X-Poedit-Country: ITALY\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -96,7 +96,7 @@ msgstr ""
 "QUALSIASI importo sarà apprezzato. Maggiori saranno i finanziamenti che "
 "CAcert riceverà e più velocemente potrà raggiungere gli obiettivi che "
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "Informazioni"
 
@@ -104,11 +104,11 @@ msgstr "Informazioni"
 msgid "About CAcert.org"
 msgstr "Informazioni su CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "Informazioni su di noi"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -271,7 +271,7 @@ msgstr "Punti di Legalizzazione che hai assegnato"
 msgid "Assurances Made"
 msgstr "Numero massimo di punti"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "Legalizzare qualcuno"
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "La Rete di Credenziali di CAcert (CAcert Web of Trust)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "Diventare un Notaio"
@@ -410,7 +410,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "Il Gruppo di Supporto di CAcert"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "La Rete di Credenziali di CAcert (CAcert Web of Trust)"
 
@@ -547,7 +547,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Cambia la Frase di Accesso (Pass Phrase)"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "Cambia Password"
@@ -570,7 +570,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Certificati per i client (Client Certificates)"
 
@@ -599,8 +599,8 @@ msgid "CommonName"
 msgstr "Nome Principale"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr ""
 "Il campo 'Nome Principale' è stato lasciato in bianco. Non posso procedere."
@@ -650,7 +650,7 @@ msgstr "Dettagli per contattare"
 msgid "Contact Email"
 msgstr "Indirizzo di posta elettronica per il contatto"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Contattaci"
@@ -718,7 +718,7 @@ msgstr "Data di nascita"
 msgid "Default"
 msgstr "Predefinito"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "Default Language"
 msgstr "Lingua predefinita"
 
@@ -779,7 +779,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Dominio"
 
@@ -787,7 +788,7 @@ msgstr "Dominio"
 msgid "Domain Certificates"
 msgstr "Certificati di Dominio"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Dominî"
@@ -796,7 +797,7 @@ msgstr "Domin
 msgid "Domains and Server Certificates."
 msgstr "Certificati per i Dominî e per i Server"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Donazioni"
@@ -820,7 +821,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Modifica"
@@ -835,7 +836,7 @@ msgstr "Modifica i dati dell'Organizzazione"
 msgid "Email"
 msgstr "Indirizzo di posta elettronica"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "Account di posta elettronica"
 
@@ -845,7 +846,7 @@ msgstr ""
 "Account di Posta Elettronica e Certificati per i Client (Client Certificates)"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "Indirizzo di posta elettronica"
 
@@ -950,11 +951,20 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Aggiungi dominio"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 msgid "Find User"
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+msgid "Find User by Domain"
+msgstr ""
+
+#: includes/account_stuff.php:181
 msgid "Find an Assurer"
 msgstr ""
 
@@ -1013,7 +1023,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "Chiavi GPG"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "Chiavi GPG/PGP"
 
@@ -1045,7 +1055,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Vai alla pagina principale"
 
@@ -1534,7 +1544,7 @@ msgstr "Luogo"
 msgid "Location Name"
 msgstr "Nome del luogo"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "Accesso (Login)"
 
@@ -1543,7 +1553,7 @@ msgstr "Accesso (Login)"
 msgid "Logos"
 msgstr "Esci dall'account"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "Esci dall'account"
 
@@ -1652,7 +1662,7 @@ msgstr ""
 msgid "My Account"
 msgstr "La mia account"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr "Le mie impostazioni di allerta"
 
@@ -1674,9 +1684,9 @@ msgstr "Le mie impostazioni di allerta"
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1684,7 +1694,7 @@ msgstr "Le mie impostazioni di allerta"
 msgid "My CAcert.org Account!"
 msgstr "La mia account su CAcert.org!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "I miei dettagli"
@@ -1693,11 +1703,11 @@ msgstr "I miei dettagli"
 msgid "My Language Settings"
 msgstr "Le mie impostazioni linguistiche"
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "Il mio elenco"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "La mia localizzazione"
 
@@ -1713,9 +1723,9 @@ msgstr "Non disponibile"
 msgid "Name"
 msgstr "Nome"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Nuovo"
 
@@ -1743,7 +1753,7 @@ msgstr "Nuovo Certificato per il Client (Client Certificate)"
 msgid "New Domain for %s"
 msgstr "Nuovo dominio per %s"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Nuova Organizzazione"
 
@@ -1772,8 +1782,8 @@ msgid "News"
 msgstr "Nuovo"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Successivo"
 
@@ -1792,6 +1802,11 @@ msgstr "Nessun nome"
 msgid "No domains are currently listed."
 msgstr "Nessun dominio è al momento elencato."
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1801,7 +1816,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "Nessun certificato di quel tipo è collegato alla tua account."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -1932,7 +1947,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1940,11 +1955,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Amministratore dell'Organizzazione"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Certificati per i Client dell'Organizzazione (Org Client Certs)"
 
@@ -1954,7 +1969,7 @@ msgstr ""
 "Certificati per i Server (Server Certificates) e per i Client (Client "
 "Certificates) dell'Organizzazione"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Certificati per i Server dell'Organizzazione (Org Server Certs)"
 
@@ -2015,7 +2030,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "Nuova Frase di Accesso (Pass Phrase)"
 
@@ -2138,7 +2153,7 @@ msgstr "Richiesta di creazione del Certificato"
 msgid "Privacy"
 msgstr "Riservatezza (Privacy)"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Politica di riservatezza"
@@ -2216,7 +2231,7 @@ msgstr "Certificato Base in formato DER. (Root Certificate)"
 msgid "Root Certificate (PEM Format)"
 msgstr "Certificato Base in formato PEM. (Root Certificate)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "Regole"
 
@@ -2316,7 +2331,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2346,7 +2361,7 @@ msgstr "Invia"
 msgid "Sensitive Information"
 msgstr "Informazioni per contattare"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Certificati per i Server (Server Certificates)"
 
@@ -2437,7 +2452,7 @@ msgstr "Invia"
 msgid "Suffix"
 msgstr "Suffisso"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2447,7 +2462,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr "Modulo TTP"
 
@@ -2523,10 +2538,17 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "La Frase di Accesso (Pass Phrase) che hai specificato è troppo corta."
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "La Frase di Accesso (Pass Phrase) che hai specificato è troppo corta."
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2676,7 +2698,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -2763,7 +2785,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr "Si è verificato un errore e non mi è possibile proseguire"
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2891,7 +2913,7 @@ msgstr "Citt
 msgid "Translations"
 msgstr "Traduzioni"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "Terze parti riconosciute."
 
@@ -2986,14 +3008,14 @@ msgstr "Verificato"
 msgid "Verified Users"
 msgstr "Verificato"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Visualizza"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Visualizza le Organizzazioni"
 
@@ -3001,7 +3023,7 @@ msgstr "Visualizza le Organizzazioni"
 msgid "Warning!"
 msgstr "Attenzione!"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -3016,7 +3038,7 @@ msgstr ""
 "i loro dettagli personali portando, come risultato finale, ad un furto "
 "dell'identità."
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -3164,7 +3186,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "Modulo WoT"
 
@@ -3548,7 +3570,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/nl.po b/locale/nl.po
index 03c029b..a47b511 100644
--- a/locale/nl.po
+++ b/locale/nl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CAcert\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-11-19 00:01+0100\n"
 "Last-Translator: Nico Baggus <cacert@noci.xs4all.nl>\n"
 "Language-Team:  <contact@CAcert.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr "%s regels getoond"
@@ -89,7 +89,7 @@ msgstr ""
 "IEDERE hoeveelheid wordt op prijs gesteld - hoe meer geld CAcert ontvangt, "
 "hoe eerder het de doelstellingen van de gemeenschap kunnen worden bereikt."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "Over"
 
@@ -97,11 +97,11 @@ msgstr "Over"
 msgid "About CAcert.org"
 msgstr "Over CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "Over Ons"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -282,7 +282,7 @@ msgstr "Aantal waarmerk punten dat u heeft uitgegeven"
 msgid "Assurances Made"
 msgstr "Waarmerk punten"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 msgid "Assure Someone"
 msgstr "Waarmerk iemand"
 
@@ -307,7 +307,7 @@ msgstr "Wordt lid van de CAcert Associatie"
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "Hoe wordt u waarmerker in het CAcert Vertrouwens Netwerk"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Becoming an Assurer"
 msgstr "Hoe wordt u een CAcert waarmerker"
 
@@ -418,7 +418,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "Het CAcert Ondersteunings Team"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "CAcert Vertrouwens Netwerk"
 
@@ -561,7 +561,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Verander uw Wachtwoord"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "Wachtwoord Veranderen"
@@ -584,7 +584,7 @@ msgstr "Klik hier om naar de Ondersteunings lijst te gaan"
 msgid "Click here to view all lists available"
 msgstr "Klik hier om alle lijsten te zien."
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Client Certifikaten"
 
@@ -611,8 +611,8 @@ msgid "CommonName"
 msgstr "Roepnaam"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "Sorry, het veld CommonName was leeg."
 
@@ -660,7 +660,7 @@ msgstr "Contact gegevens"
 msgid "Contact Email"
 msgstr "Contact via E-mail"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Neem contact met ons op"
@@ -732,7 +732,7 @@ msgstr "Geboortedatum"
 msgid "Default"
 msgstr "Standaard"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "Default Language"
 msgstr "Standaard taal"
 
@@ -796,7 +796,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Domein"
 
@@ -804,7 +805,7 @@ msgstr "Domein"
 msgid "Domain Certificates"
 msgstr "Domein Certifikaten"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Domeinen"
@@ -813,7 +814,7 @@ msgstr "Domeinen"
 msgid "Domains and Server Certificates."
 msgstr "Domein en Server Certificaten"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Donaties"
@@ -837,7 +838,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Aanpassen"
@@ -852,7 +853,7 @@ msgstr "Pas Organisatiegegevens Aan"
 msgid "Email"
 msgstr "Voeg E-mail Adres Toe"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "E-mail Accounts"
 
@@ -861,7 +862,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "Email Accounts en Client Certificaten"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "E-mail Adres"
 
@@ -975,11 +976,21 @@ msgstr ""
 "Ten slotte wordt u gevraagd om gegevens voor het 'extra' veld in te vullen. "
 "Deze vragen kunt u gewoon blanko invullen."
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Domein Toevoegen"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 msgid "Find User"
 msgstr "Zoek gebruiker"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "Zoek gebruiker"
+
+#: includes/account_stuff.php:181
 msgid "Find an Assurer"
 msgstr "Zoek iemand die kan waarmerken"
 
@@ -1042,7 +1053,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "GPG Sleutels"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "GPG/PGP Sleutels"
 
@@ -1076,7 +1087,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr "Maak een nieuw sleutelpaar en CSR voor IIS 5.0"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Naar Hoofdpagina"
 
@@ -1571,7 +1582,7 @@ msgstr "Plaats"
 msgid "Location Name"
 msgstr "Plaatsnaam"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "Aanmelden"
 
@@ -1580,7 +1591,7 @@ msgstr "Aanmelden"
 msgid "Logos"
 msgstr "Uitloggen"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "Uitloggen"
 
@@ -1685,7 +1696,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Mijn Account"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr "Mijn Waarschuwingen"
 
@@ -1707,9 +1718,9 @@ msgstr "Mijn Waarschuwingen"
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1717,7 +1728,7 @@ msgstr "Mijn Waarschuwingen"
 msgid "My CAcert.org Account!"
 msgstr "Mijn CAcert.org Account!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Mijn Gegevens"
@@ -1726,11 +1737,11 @@ msgstr "Mijn Gegevens"
 msgid "My Language Settings"
 msgstr "Mijn taal instellingen"
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "Mijn Overzicht"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "Mijn Locatie"
 
@@ -1746,9 +1757,9 @@ msgstr "Niet Beschikbaar"
 msgid "Name"
 msgstr "Naam"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Nieuw"
 
@@ -1776,7 +1787,7 @@ msgstr "Nieuw Client Certifikaat"
 msgid "New Domain for %s"
 msgstr "Nieuw Domein voor %s"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Nieuwe Organisatie"
 
@@ -1802,8 +1813,8 @@ msgid "News"
 msgstr "Nieuw"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Volgende"
 
@@ -1826,6 +1837,11 @@ msgstr "Geen Naam"
 msgid "No domains are currently listed."
 msgstr "Er zijn geen domeinen om weer te geven."
 
+#: www/account/49.php:50
+#, fuzzy, php-format
+msgid "No domains found matching %s"
+msgstr "Geen gebruikers gevonden met %s"
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr "Er zijn geen email voor uw sleutel gevonden"
@@ -1835,7 +1851,7 @@ msgstr "Er zijn geen email voor uw sleutel gevonden"
 msgid "No such certificate attached to your account."
 msgstr "Dit certifikaat is niet aan uw account verbonden."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr "Geen gebruiker gevonden"
 
@@ -1965,7 +1981,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr "Alleen de eerste 100 regels worden getoond."
 
@@ -1973,11 +1989,11 @@ msgstr "Alleen de eerste 100 regels worden getoond."
 msgid "Open Directory Security folder"
 msgstr "Open de Directory Beveiligings map"
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Org Admin"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Org Client Certifikaten"
 
@@ -1985,7 +2001,7 @@ msgstr "Org Client Certifikaten"
 msgid "Org Client and Server Certificates"
 msgstr "Org Client en Server Certifikaten"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Org Server Certifikaten"
 
@@ -2044,7 +2060,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "Wachtwoord"
 
@@ -2162,7 +2178,7 @@ msgstr "Start de aanvraag"
 msgid "Privacy"
 msgstr "Privacy"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Privacy Policy"
@@ -2243,7 +2259,7 @@ msgstr "Root Certifikaat (DER formaat)"
 msgid "Root Certificate (PEM Format)"
 msgstr "Root Certifikaat (PEM formaat)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "Regels"
 
@@ -2359,7 +2375,7 @@ msgstr ""
 "Kies 'Server Certifikaat' aan de onderkant in het tab-blad van de 'Secure "
 "communications' sectie."
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr "Kies eigen account gegevens"
 
@@ -2392,7 +2408,7 @@ msgstr "Versturen"
 msgid "Sensitive Information"
 msgstr "Gevoelige informatie "
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Server Certifikaten"
 
@@ -2490,7 +2506,7 @@ msgstr "Versturen"
 msgid "Suffix"
 msgstr "Suffix"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr "Systeem beheer"
 
@@ -2502,7 +2518,7 @@ msgstr ""
 "Het systeem stuurt u een email met een link er in, u moet die link openen "
 "met een webbrowser."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr "TTP formulier"
 
@@ -2579,10 +2595,17 @@ msgstr ""
 "Het 'Organisational Unit' veld is een vrij veld. Het wordt vaak gebruikt "
 "voor de afdeling of servernaam ter referentie."
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "Het nieuwe wachtwoord dat u hebt ingegeven is te kort."
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "Het nieuwe wachtwoord dat u hebt ingegeven is te kort."
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2724,7 +2747,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr "Het wachtwoord voor %s is succesvol bijgewerkt in het systeem"
@@ -2820,7 +2843,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr "Er is een fout opgetreden, de bewerking is afgebroken."
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2959,7 +2982,7 @@ msgstr "Stad/Gemeente"
 msgid "Translations"
 msgstr "Vertalingen"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "Vertrouwde Derde Partijen"
 
@@ -3054,14 +3077,14 @@ msgstr "Gecontroleerd"
 msgid "Verified Users"
 msgstr "Gecontroleerd"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Bekijken"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Bekijk Organisaties"
 
@@ -3069,7 +3092,7 @@ msgstr "Bekijk Organisaties"
 msgid "Warning!"
 msgstr "Waarschuwing!"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -3082,7 +3105,7 @@ msgstr ""
 "stelen en andersmans accountgegevens kan raadplegen met diefstal van "
 "identiteit als gevolg."
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -3242,7 +3265,7 @@ msgstr ""
 "is dat als een van de sub-root sleutels beschadigd is deze ingetrokken en "
 "opnieuw kan worden uitgegeven."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "WoT Formulier"
 
@@ -3653,7 +3676,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/pt.po b/locale/pt.po
index fe734d4..5044143 100644
--- a/locale/pt.po
+++ b/locale/pt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CAcert.org Translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-09-26 02:27+1000\n"
 "Last-Translator: Duane <duane@cacert.org>\n"
 "Language-Team: Evaldo Gardenali <evaldo@gardenali.biz>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -88,7 +88,7 @@ msgid ""
 "sooner it can achieve the goals of the community."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "Sobre"
 
@@ -97,11 +97,11 @@ msgstr "Sobre"
 msgid "About CAcert.org"
 msgstr "Afilie-se à CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "Sobre Nós"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -263,7 +263,7 @@ msgstr "Pontos de Notariza
 msgid "Assurances Made"
 msgstr "Pontos de Notarização"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "Notarizar alguem"
@@ -292,7 +292,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "Rede de confiança CAcert"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "Tornando-se um Notário"
@@ -383,7 +383,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "Time de Suporte CAcert.org!"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "Rede de confiança CAcert"
 
@@ -519,7 +519,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Alterar Frase-Senha"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "Alterar Senha"
@@ -542,7 +542,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Certificados de Cliente"
 
@@ -571,8 +571,8 @@ msgid "CommonName"
 msgstr "NomeComum"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "Campo NomeComum em branco. Impossível continuar."
 
@@ -618,7 +618,7 @@ msgstr "Detalhes de Contato"
 msgid "Contact Email"
 msgstr "Email de Contato"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Contacte-nos"
@@ -686,7 +686,7 @@ msgstr "Data de Nascimento"
 msgid "Default"
 msgstr "Padrão"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 #, fuzzy
 msgid "Default Language"
 msgstr "Padrão"
@@ -748,7 +748,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Domínio"
 
@@ -756,7 +757,7 @@ msgstr "Dom
 msgid "Domain Certificates"
 msgstr "Certificados de Domínio"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Domínios"
@@ -766,7 +767,7 @@ msgstr "Dom
 msgid "Domains and Server Certificates."
 msgstr "Certificados de Domínio"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Doações"
@@ -788,7 +789,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Editar"
@@ -804,7 +805,7 @@ msgstr "Editar Organiza
 msgid "Email"
 msgstr "Email"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "Contas de Email"
 
@@ -814,7 +815,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "Certificados de Cliente"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "Endereço de Email"
 
@@ -918,12 +919,22 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Adicionar Domínio"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 #, fuzzy
 msgid "Find User"
 msgstr "Tornando-se um Notário"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "Tornando-se um Notário"
+
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Find an Assurer"
 msgstr "Tornando-se um Notário"
@@ -982,7 +993,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "Chaves GPG/PGP"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "Chaves GPG/PGP"
 
@@ -1014,7 +1025,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Ir à Página Principal"
 
@@ -1447,7 +1458,7 @@ msgstr "Localiza
 msgid "Location Name"
 msgstr "Localização"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 #, fuzzy
 msgid "Login"
 msgstr "Login por Certificado"
@@ -1457,7 +1468,7 @@ msgstr "Login por Certificado"
 msgid "Logos"
 msgstr "Finalizar sessão"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "Finalizar sessão"
 
@@ -1566,7 +1577,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Minha Conta"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr ""
 
@@ -1588,9 +1599,9 @@ msgstr ""
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1598,7 +1609,7 @@ msgstr ""
 msgid "My CAcert.org Account!"
 msgstr "Minha conta CAcert.org!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Meus Detalhes"
@@ -1607,11 +1618,11 @@ msgstr "Meus Detalhes"
 msgid "My Language Settings"
 msgstr ""
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "Minha Listagem"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "Minha Localização"
 
@@ -1627,9 +1638,9 @@ msgstr "N/D"
 msgid "Name"
 msgstr "Nome"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Novo"
 
@@ -1657,7 +1668,7 @@ msgstr "Novo Certificado de Cliente"
 msgid "New Domain for %s"
 msgstr "Novo Domínio para %s"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Nova Organização"
 
@@ -1684,8 +1695,8 @@ msgid "News"
 msgstr "Novo"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Próximo"
 
@@ -1704,6 +1715,11 @@ msgstr "Sem Nome"
 msgid "No domains are currently listed."
 msgstr "Nenhum domínio cadastrado atualmente."
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1713,7 +1729,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "Certificado não vinculado à sua conta."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -1836,7 +1852,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1844,11 +1860,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Administrador da Organização"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Certificados de Cliente de Organização"
 
@@ -1857,7 +1873,7 @@ msgstr "Certificados de Cliente de Organiza
 msgid "Org Client and Server Certificates"
 msgstr "Certificado de Servidor"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Certificados de Servidor de Organização"
 
@@ -1919,7 +1935,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 #, fuzzy
 msgid "Pass Phrase"
 msgstr "Nova Frase-Senha"
@@ -2038,7 +2054,7 @@ msgstr "Criar Pedido de Certificado"
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Política de Privacidade"
@@ -2118,7 +2134,7 @@ msgstr "Certificado Raiz"
 msgid "Root Certificate (PEM Format)"
 msgstr "Certificado Raiz"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "Regras"
 
@@ -2219,7 +2235,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2249,7 +2265,7 @@ msgstr "Enviar"
 msgid "Sensitive Information"
 msgstr "Informações de Contato"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Certificado de Servidor"
 
@@ -2337,7 +2353,7 @@ msgstr "Enviar"
 msgid "Suffix"
 msgstr "Sufixo"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2347,7 +2363,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr "Formulário TTP"
 
@@ -2415,10 +2431,17 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "A Frase-Senha enviada é muito curta."
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "A Frase-Senha enviada é muito curta."
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2536,7 +2559,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -2622,7 +2645,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr "Houve um erro, sendo impossível continuar"
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2741,7 +2764,7 @@ msgstr "Cidade/Sub
 msgid "Translations"
 msgstr "Traduções"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "Terceiros acreditados"
 
@@ -2834,14 +2857,14 @@ msgstr "Verificado"
 msgid "Verified Users"
 msgstr "Verificado"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Ver"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Ver Organizações"
 
@@ -2849,7 +2872,7 @@ msgstr "Ver Organiza
 msgid "Warning!"
 msgstr "Aviso!"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -2857,7 +2880,7 @@ msgid ""
 "exposing their account, personal details and identity theft as a result."
 msgstr ""
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -2975,7 +2998,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "Formulário WoT"
 
@@ -3348,7 +3371,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 3aea5ef..d0b13e7 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-11-18 17:54-0200\n"
 "Last-Translator: William Amaral <william@linuxtime.com.br>\n"
 "Language-Team: Brazilian <pt@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -92,7 +92,7 @@ msgid ""
 "sooner it can achieve the goals of the community."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "Sobre"
 
@@ -101,11 +101,11 @@ msgstr "Sobre"
 msgid "About CAcert.org"
 msgstr "Afilie-se à CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "Sobre Nós"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -271,7 +271,7 @@ msgstr "Pontos de Notariza
 msgid "Assurances Made"
 msgstr "Pontos de Notarização"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "Notarizar alguem"
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "Rede de confiança CAcert"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "Tornando-se um Notário"
@@ -391,7 +391,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "Time de Suporte CAcert.org!"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "Rede de confiança CAcert"
 
@@ -529,7 +529,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Alterar Frase-Senha"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 #, fuzzy
 msgid "Change Password"
@@ -553,7 +553,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Certificados de Cliente"
 
@@ -582,8 +582,8 @@ msgid "CommonName"
 msgstr "NomeComum"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "Campo NomeComum em branco. Impossível continuar."
 
@@ -629,7 +629,7 @@ msgstr "Detalhes de Contato"
 msgid "Contact Email"
 msgstr "Email de Contato"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Contacte-nos"
@@ -700,7 +700,7 @@ msgstr "Data de Nascimento"
 msgid "Default"
 msgstr "Identidade Padrão"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 #, fuzzy
 msgid "Default Language"
 msgstr "Usar Valor Padrão"
@@ -762,7 +762,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 #, fuzzy
 msgid "Domain"
 msgstr "Empresa"
@@ -771,7 +772,7 @@ msgstr "Empresa"
 msgid "Domain Certificates"
 msgstr "Certificados de Domínio"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 #, fuzzy
 msgid "Domains"
@@ -782,7 +783,7 @@ msgstr "Quadrinhos"
 msgid "Domains and Server Certificates."
 msgstr "Certificados de Domínio"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 #, fuzzy
 msgid "Donations"
@@ -805,7 +806,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Editar"
@@ -821,7 +822,7 @@ msgstr "Editar Organiza
 msgid "Email"
 msgstr "Email"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "Contas de Email"
 
@@ -831,7 +832,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "Certificados de Cliente"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 #, fuzzy
 msgid "Email Address"
 msgstr "Seu Endereço de Emai:"
@@ -939,12 +940,22 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Incluir parceiro"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 #, fuzzy
 msgid "Find User"
 msgstr "Tornando-se um Notário"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "Tornando-se um Notário"
+
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Find an Assurer"
 msgstr "Tornando-se um Notário"
@@ -1003,7 +1014,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "Chaves GPG/PGP"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "Chaves GPG/PGP"
 
@@ -1035,7 +1046,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 #, fuzzy
 msgid "Go Home"
 msgstr "Residência"
@@ -1473,7 +1484,7 @@ msgstr "Localiza
 msgid "Location Name"
 msgstr "Localização"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 #, fuzzy
 msgid "Login"
 msgstr "Conectar"
@@ -1483,7 +1494,7 @@ msgstr "Conectar"
 msgid "Logos"
 msgstr "Fechar"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 #, fuzzy
 msgid "Logout"
 msgstr "Fechar"
@@ -1596,7 +1607,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Minha Conta"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr ""
 
@@ -1618,9 +1629,9 @@ msgstr ""
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1628,7 +1639,7 @@ msgstr ""
 msgid "My CAcert.org Account!"
 msgstr "Minha conta CAcert.org!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Meus Detalhes"
@@ -1637,11 +1648,11 @@ msgstr "Meus Detalhes"
 msgid "My Language Settings"
 msgstr ""
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "Minha Listagem"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "Minha Localização"
 
@@ -1659,9 +1670,9 @@ msgstr "N/D"
 msgid "Name"
 msgstr "Nome"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Novo"
 
@@ -1689,7 +1700,7 @@ msgstr "Novo Certificado de Cliente"
 msgid "New Domain for %s"
 msgstr "Novo Domínio para %s"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Nova Organização"
 
@@ -1716,8 +1727,8 @@ msgid "News"
 msgstr "Novo"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Próximo"
 
@@ -1737,6 +1748,11 @@ msgstr "Nome"
 msgid "No domains are currently listed."
 msgstr "Nenhum domínio cadastrado atualmente."
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1746,7 +1762,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "Certificado não vinculado à sua conta."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -1870,7 +1886,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1878,11 +1894,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Administrador da Organização"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Certificados de Cliente de Organização"
 
@@ -1891,7 +1907,7 @@ msgstr "Certificados de Cliente de Organiza
 msgid "Org Client and Server Certificates"
 msgstr "Certificado de Servidor"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Certificados de Servidor de Organização"
 
@@ -1954,7 +1970,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 #, fuzzy
 msgid "Pass Phrase"
 msgstr "Nova Frase-Senha"
@@ -2073,7 +2089,7 @@ msgstr "Criar Pedido de Certificado"
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Política de Privacidade"
@@ -2154,7 +2170,7 @@ msgstr "Certificado Raiz"
 msgid "Root Certificate (PEM Format)"
 msgstr "Certificado Raiz"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Rules"
 msgstr "Regra"
@@ -2256,7 +2272,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2286,7 +2302,7 @@ msgstr "Enviar"
 msgid "Sensitive Information"
 msgstr "Outra Informação"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Certificado de Servidor"
 
@@ -2374,7 +2390,7 @@ msgstr "Enviar"
 msgid "Suffix"
 msgstr "Sufixo"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2384,7 +2400,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr "Formulário TTP"
 
@@ -2452,10 +2468,17 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "A Frase-Senha enviada é muito curta."
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "A Frase-Senha enviada é muito curta."
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2573,7 +2596,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -2659,7 +2682,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr "Houve um erro, sendo impossível continuar"
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2778,7 +2801,7 @@ msgstr "Cidade/Sub
 msgid "Translations"
 msgstr "Traduções"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "Terceiros acreditados"
 
@@ -2872,14 +2895,14 @@ msgstr "Verificado"
 msgid "Verified Users"
 msgstr "Verificado"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Ver"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Ver Organizações"
 
@@ -2888,7 +2911,7 @@ msgstr "Ver Organiza
 msgid "Warning!"
 msgstr "Aviso"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -2896,7 +2919,7 @@ msgid ""
 "exposing their account, personal details and identity theft as a result."
 msgstr ""
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -3015,7 +3038,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "Formulário WoT"
 
@@ -3389,7 +3412,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/ru.po b/locale/ru.po
index 9a6f675..f9409ce 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CAcert\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-12-05 14:11+0200\n"
 "Last-Translator: Robert Golovniov <golovniov@interia.pl>\n"
 "Language-Team: RUSSIAN <LL@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: UKRAINE\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -88,7 +88,7 @@ msgstr ""
 "CAcert, âÕÜ áÚŞàÕÕ ŞİĞ áÜŞÖÕâ ÔŞáâØçì æÕÛÕÙ, ߪáâĞÒÛÕİİëå ᪪ÑéÕáâÒŞÜ "
 "ߪÛìתÒĞâÕÛÕÙ."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "¾"
 
@@ -96,11 +96,11 @@ msgstr "
 msgid "About CAcert.org"
 msgstr "¾ CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "¾ İĞá"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -256,7 +256,7 @@ msgstr ""
 msgid "Assurances Made"
 msgstr ""
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 msgid "Assure Someone"
 msgstr "·ĞÒÕàÕİØÕ ÛØçİŞáâØ"
 
@@ -280,7 +280,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "ÁâĞâì ×ĞÒÕàØâÕÛÕÜ Ò ÁÕâØ ÔŞÒÕàØï CAcert"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Becoming an Assurer"
 msgstr "ºĞÚ áâĞâì ·ĞÒÕàØâÕÛÕÜ"
 
@@ -366,7 +366,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "³àãßßĞ ßŞÔÔÕàÖÚØ CAcert"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "ÁÕâì ÔŞÒÕàØï CAcert"
 
@@ -486,7 +486,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "¸×ÜÕİØâì ØÔÕİâØäØÚĞæØŞİİãî äàĞ×ã"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "¸×ÜÕİØâì ßĞàŞÛì"
@@ -509,7 +509,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr "½ĞÖĞâì ×ÔÕáì, çâŞÑë ߪáÜŞâàÕâì ÒáÕ ÔÕÙáâÒãîéØÕ áßØáÚØ àĞááëÛÚØ"
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "ºÛØÕİâáÚØÕ áÕàâØäØÚĞâë"
 
@@ -536,8 +536,8 @@ msgid "CommonName"
 msgstr "CommonName"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "¿ŞÛÕ \"CommonName\" ßãáâŞ. ½Õ ÜŞÓã ßàŞÔŞÛÖĞâì."
 
@@ -578,7 +578,7 @@ msgstr ""
 msgid "Contact Email"
 msgstr ""
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr ""
@@ -645,7 +645,7 @@ msgstr "
 msgid "Default"
 msgstr ""
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "Default Language"
 msgstr "Ï×ëÚ ßŞ ãÜŞÛçĞİØî"
 
@@ -706,7 +706,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "´ŞÜÕİ"
 
@@ -714,7 +715,7 @@ msgstr "
 msgid "Domain Certificates"
 msgstr ""
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "´ŞÜÕİë"
@@ -723,7 +724,7 @@ msgstr "
 msgid "Domains and Server Certificates."
 msgstr ""
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "¿ŞÖÕàâÒŞÒĞİØï"
@@ -745,7 +746,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "ÀÕÔĞÚâØàŞÒĞâì"
@@ -760,7 +761,7 @@ msgstr "
 msgid "Email"
 msgstr "Email"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "°ÔàÕáĞ email"
 
@@ -769,7 +770,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr ""
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "°ÔàÕá email"
 
@@ -870,11 +871,21 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "´ŞÑĞÒØâì ÔŞÜÕİ"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 msgid "Find User"
 msgstr "½ĞÙâØ ¿ŞÛìתÒĞâÕÛï"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "½ĞÙâØ ¿ŞÛìתÒĞâÕÛï"
+
+#: includes/account_stuff.php:181
 msgid "Find an Assurer"
 msgstr "½ĞÙâØ ·ĞÒÕàØâÕÛï"
 
@@ -932,7 +943,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "ºÛîçØ GPG"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "ºÛîçØ GPG/PGP"
 
@@ -964,7 +975,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "½Ğ ÔŞÜĞèİîî áâàĞİØæã"
 
@@ -1367,7 +1378,7 @@ msgstr ""
 msgid "Location Name"
 msgstr ""
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "²åŞÔ"
 
@@ -1376,7 +1387,7 @@ msgstr "
 msgid "Logos"
 msgstr "²ëåŞÔ"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "²ëåŞÔ"
 
@@ -1482,7 +1493,7 @@ msgstr ""
 msgid "My Account"
 msgstr "¼Şï ãçÕâİĞï ×ĞßØáì"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr ""
 
@@ -1504,9 +1515,9 @@ msgstr ""
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1514,7 +1525,7 @@ msgstr ""
 msgid "My CAcert.org Account!"
 msgstr "¼Şï ãçÕâİĞï ×ĞßØáì İĞ CAcert.org!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "¾ÑŞ ÜİÕ"
@@ -1523,11 +1534,11 @@ msgstr "
 msgid "My Language Settings"
 msgstr "ÃáâĞİŞÒÚĞ ï×ëÚĞ"
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "¼Şï ߪ×ØæØï Ò ÚĞâĞÛŞÓÕ"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "¼Õá⪠ÖØâÕÛìáâÒĞ"
 
@@ -1543,9 +1554,9 @@ msgstr "
 msgid "Name"
 msgstr ""
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "½ŞÒëÙ"
 
@@ -1571,7 +1582,7 @@ msgstr "
 msgid "New Domain for %s"
 msgstr "½ŞÒëÙ ÔŞÜÕİ %s"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "½ŞÒĞï ŞàÓĞİØ×ĞæØï"
 
@@ -1597,8 +1608,8 @@ msgid "News"
 msgstr "½ŞÒëÙ"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "´ĞÛÕÕ"
 
@@ -1617,6 +1628,11 @@ msgstr ""
 msgid "No domains are currently listed."
 msgstr ""
 
+#: www/account/49.php:50
+#, fuzzy, php-format
+msgid "No domains found matching %s"
+msgstr "¿Ş ÔĞİİëÜ ÚàØâÕàØïÜ (%s) ߪÛìתÒĞâÕÛÕÙ İÕ İĞÙÔÕİŞ"
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr "½Ğ ²ĞèÕÜ ÚÛîçÕ İÕ İĞÙÔÕİŞ ĞÔàÕáŞÒ email"
@@ -1626,7 +1642,7 @@ msgstr "
 msgid "No such certificate attached to your account."
 msgstr ""
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr "¿ŞÛìתÒĞâÕÛì İÕ İĞÙÔÕİ."
 
@@ -1747,7 +1763,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1755,11 +1771,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr ""
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr ""
 
@@ -1767,7 +1783,7 @@ msgstr ""
 msgid "Org Client and Server Certificates"
 msgstr ""
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr ""
 
@@ -1826,7 +1842,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr ""
 
@@ -1932,7 +1948,7 @@ msgstr ""
 msgid "Privacy"
 msgstr ""
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr ""
@@ -2010,7 +2026,7 @@ msgstr ""
 msgid "Root Certificate (PEM Format)"
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr ""
 
@@ -2108,7 +2124,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2137,7 +2153,7 @@ msgstr ""
 msgid "Sensitive Information"
 msgstr ""
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr ""
 
@@ -2218,7 +2234,7 @@ msgstr ""
 msgid "Suffix"
 msgstr ""
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2228,7 +2244,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr ""
 
@@ -2291,10 +2307,16 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr ""
 
+#: www/index.php:95
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr ""
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2399,7 +2421,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -2479,7 +2501,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr ""
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2598,7 +2620,7 @@ msgstr "
 msgid "Translations"
 msgstr "´àãÓØÕ ï×ëÚØ"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "´ŞÒÕàÕİİëÕ âàÕâìØ ÛØæĞ"
 
@@ -2687,14 +2709,14 @@ msgstr ""
 msgid "Verified Users"
 msgstr ""
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr ""
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr ""
 
@@ -2702,7 +2724,7 @@ msgstr ""
 msgid "Warning!"
 msgstr ""
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -2710,7 +2732,7 @@ msgid ""
 "exposing their account, personal details and identity theft as a result."
 msgstr ""
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -2827,7 +2849,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "°İÚÕâĞ WoT"
 
@@ -3142,7 +3164,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/sv.po b/locale/sv.po
index 8e35a47..6e28742 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-11-23 20:26+0100\n"
 "Last-Translator: Lars Mattsson <lm@nisp.se>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -89,7 +89,7 @@ msgstr ""
 "ALLA gåvor emottages tacksamt - desto mer medel CAcert får in, desto "
 "snabbare kan vi nå vårt mål."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "Om"
 
@@ -97,11 +97,11 @@ msgstr "Om"
 msgid "About CAcert.org"
 msgstr "Om CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "Om oss"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -262,7 +262,7 @@ msgstr "Notariepoäng du har utfärdat"
 msgid "Assurances Made"
 msgstr "Maxpoäng"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "Verifiera någon"
@@ -291,7 +291,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "CAcert:s Web of Trust"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "Att bli en notarie"
@@ -394,7 +394,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "CAcert supportteam"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "CAcert:s Web of Trust"
 
@@ -528,7 +528,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Ändra hemlig fras"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "Ändra lösenord"
@@ -551,7 +551,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "Klientcertifikat"
 
@@ -580,8 +580,8 @@ msgid "CommonName"
 msgstr "CommonName"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "CommonName-fältet lämnades tomt. Kan inte fortsätta."
 
@@ -628,7 +628,7 @@ msgstr "Kontaktdetaljer"
 msgid "Contact Email"
 msgstr "Kontakt-email"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Kontakta oss"
@@ -695,7 +695,7 @@ msgstr "Födelsedatum"
 msgid "Default"
 msgstr "Standard"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "Default Language"
 msgstr "Standard-språk"
 
@@ -756,7 +756,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Domän"
 
@@ -764,7 +765,7 @@ msgstr "Domän"
 msgid "Domain Certificates"
 msgstr "Domäncertifikat"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Domäner"
@@ -773,7 +774,7 @@ msgstr "Domäner"
 msgid "Domains and Server Certificates."
 msgstr "Domän- och servercertifikat"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Donationer"
@@ -797,7 +798,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Redigera"
@@ -812,7 +813,7 @@ msgstr "Redigera organisation"
 msgid "Email"
 msgstr "Email"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "Epostkonton"
 
@@ -821,7 +822,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "Emailkonton och klientcertifikat"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "Emailadress"
 
@@ -926,11 +927,20 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Lägg till domän"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 msgid "Find User"
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+msgid "Find User by Domain"
+msgstr ""
+
+#: includes/account_stuff.php:181
 msgid "Find an Assurer"
 msgstr ""
 
@@ -989,7 +999,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "GPG-nycklar"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "GPG/PGP-nycklar"
 
@@ -1021,7 +1031,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Hem"
 
@@ -1492,7 +1502,7 @@ msgstr "Belägenhet"
 msgid "Location Name"
 msgstr "Belägenhet"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "Logga in"
 
@@ -1501,7 +1511,7 @@ msgstr "Logga in"
 msgid "Logos"
 msgstr "Logga ut"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "Logga ut"
 
@@ -1609,7 +1619,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Mitt konto"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr "Mina notifieringsinställningar"
 
@@ -1631,9 +1641,9 @@ msgstr "Mina notifieringsinställningar"
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1641,7 +1651,7 @@ msgstr "Mina notifieringsinställningar"
 msgid "My CAcert.org Account!"
 msgstr "Mitt CAcert-konto!"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Mina detaljer"
@@ -1650,11 +1660,11 @@ msgstr "Mina detaljer"
 msgid "My Language Settings"
 msgstr "Mina språkinställningar"
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "Min listning"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "Min belägenhet"
 
@@ -1670,9 +1680,9 @@ msgstr "Ej tillgänglig"
 msgid "Name"
 msgstr "Namn"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Nytt"
 
@@ -1700,7 +1710,7 @@ msgstr "Nytt klientcertifikat"
 msgid "New Domain for %s"
 msgstr "Ny domän för %s"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Ny organisation"
 
@@ -1727,8 +1737,8 @@ msgid "News"
 msgstr "Nytt"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Nästa"
 
@@ -1747,6 +1757,11 @@ msgstr "Inget namn"
 msgid "No domains are currently listed."
 msgstr "Inga domäner finns listade."
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1756,7 +1771,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "Inget sådant certifikat finns anslutet till ditt konto."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -1884,7 +1899,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1892,11 +1907,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Företagsadministrator"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Företagsklientcertifikat"
 
@@ -1904,7 +1919,7 @@ msgstr "Företagsklientcertifikat"
 msgid "Org Client and Server Certificates"
 msgstr "Företagsklient- och servercertifikat"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Företagsservercertifikat"
 
@@ -1963,7 +1978,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "Hemlig fras"
 
@@ -2079,7 +2094,7 @@ msgstr "Skapa certifikatbegäran"
 msgid "Privacy"
 msgstr "Sekretess"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Sekretesspolicy"
@@ -2157,7 +2172,7 @@ msgstr "Root-certifikat (i DER-format)"
 msgid "Root Certificate (PEM Format)"
 msgstr "Root-certifikat (i PEM-format)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "Regler"
 
@@ -2257,7 +2272,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2287,7 +2302,7 @@ msgstr "Skicka"
 msgid "Sensitive Information"
 msgstr "Kontaktinformation"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Servercertifikat"
 
@@ -2376,7 +2391,7 @@ msgstr "Skicka"
 msgid "Suffix"
 msgstr "Suffix"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2386,7 +2401,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr "TTP-formulär"
 
@@ -2460,10 +2475,17 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "Lösenfrasen du angav var för kort. "
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "Lösenfrasen du angav var för kort. "
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2593,7 +2615,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -2678,7 +2700,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr "Ett fel har uppstått och jag kan inte fortsätta"
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2802,7 +2824,7 @@ msgstr "Postort"
 msgid "Translations"
 msgstr "Översättningar"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "PÃ¥litlig tredje-part"
 
@@ -2895,14 +2917,14 @@ msgstr "Verifierad"
 msgid "Verified Users"
 msgstr "Verifierad"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Visa"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Visa företag"
 
@@ -2910,7 +2932,7 @@ msgstr "Visa företag"
 msgid "Warning!"
 msgstr "Varning!"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -2922,7 +2944,7 @@ msgstr ""
 "förhindrar att någon kopierar sessions-ID:t vilket kan leda till bl.a. "
 "identitetsstöld."
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -3062,7 +3084,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "WoT-formulär"
 
@@ -3433,7 +3455,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/tr.po b/locale/tr.po
index 9824118..8f5ae7c 100644
--- a/locale/tr.po
+++ b/locale/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CAcert-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-11-18 18:10+1100\n"
 "Last-Translator: Selcuk Karayakaylar <karayakaylar@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr "%s satır gösterimde."
@@ -89,7 +89,7 @@ msgstr ""
 "CAcert'e yapılan maddi katkı ne kadar büyük olursa topluluğun amaçları o "
 "kadar erken gerçekleşecektir."
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "Hakkında"
 
@@ -97,11 +97,11 @@ msgstr "Hakk
 msgid "About CAcert.org"
 msgstr "CAcert.org Hakkında"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "Hakkımızda"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -279,7 +279,7 @@ msgstr "Verdi
 msgid "Assurances Made"
 msgstr "Güvence Puanı"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 msgid "Assure Someone"
 msgstr "Birisine Güvence Verin"
 
@@ -304,7 +304,7 @@ msgstr "CAcert Association'un bir 
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "CAcert Web of Trust'in güvence vericisi olun"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Becoming an Assurer"
 msgstr "Güvence Verici olmak"
 
@@ -410,7 +410,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "CAcert Destek Ekibi"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr "CAcert Web of Trust"
 
@@ -549,7 +549,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "Geçiş Tabirini Değiştir"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "Parola Değiştir"
@@ -572,7 +572,7 @@ msgstr "Destek Listesi'ne gitmek i
 msgid "Click here to view all lists available"
 msgstr "Mevcut tüm listeleri görmek için buraya tıklayınız"
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "İstemci Sertifikaları"
 
@@ -599,8 +599,8 @@ msgid "CommonName"
 msgstr "YayginAd"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr "YayginAd alanı boş bırakılmış. Devam edilemez."
 
@@ -643,7 +643,7 @@ msgstr "Ula
 msgid "Contact Email"
 msgstr "E-posta Ulaşım"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "Bize Ulaşın"
@@ -714,7 +714,7 @@ msgstr "Do
 msgid "Default"
 msgstr "Varsayılan"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "Default Language"
 msgstr "Varsayılan Dil"
 
@@ -784,7 +784,8 @@ msgstr ""
 "nitelendirilmiştir."
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "Alan Adı"
 
@@ -792,7 +793,7 @@ msgstr "Alan Ad
 msgid "Domain Certificates"
 msgstr "Alan Adı Sertifikaları"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr "Alan Adları"
@@ -801,7 +802,7 @@ msgstr "Alan Adlar
 msgid "Domains and Server Certificates."
 msgstr "Alan Adları ve Sunucu Sertifikaları."
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "Bağışlar"
@@ -832,7 +833,7 @@ msgstr ""
 "ayarları yaparak indirdiğiniz sertifikayı kullanarak sayısal imzanızı etkin "
 "kılabilirsiniz. Olmada mı? Beni arayın size nasıl yapacağınızı anlatayım."
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "Düzenle"
@@ -847,7 +848,7 @@ msgstr "Organizasyon D
 msgid "Email"
 msgstr "E-posta"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "E-posta Hesapları"
 
@@ -856,7 +857,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr "E-posta Hesapları ve İstemci Sertifikaları"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "E-posta Adresi"
 
@@ -968,11 +969,21 @@ msgstr ""
 "Son olarak size 'extra' özelliği konusunda bilgi sorulacaktır, basitçe her "
 "iki soru için enter'a basın."
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "Alan Adı Ekle"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 msgid "Find User"
 msgstr "Kullanıcı Bul"
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+#, fuzzy
+msgid "Find User by Domain"
+msgstr "Kullanıcı Bul"
+
+#: includes/account_stuff.php:181
 msgid "Find an Assurer"
 msgstr "Bir Güvence Verici Bul"
 
@@ -1036,7 +1047,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "GPG Anahtarları"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "GPG/PGP Anahtarları"
 
@@ -1068,7 +1079,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "Ana Sayfaya Git"
 
@@ -1471,7 +1482,7 @@ msgstr "Yer"
 msgid "Location Name"
 msgstr "Yer Adı"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "Giriş"
 
@@ -1480,7 +1491,7 @@ msgstr "Giri
 msgid "Logos"
 msgstr "Çıkış"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "Çıkış"
 
@@ -1585,7 +1596,7 @@ msgstr ""
 msgid "My Account"
 msgstr "Hesabım"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr "Uyarı Ayarlarım"
 
@@ -1607,9 +1618,9 @@ msgstr "Uyar
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1617,7 +1628,7 @@ msgstr "Uyar
 msgid "My CAcert.org Account!"
 msgstr "CAcert.org Hesabım"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "Ayrıntılarım"
@@ -1626,11 +1637,11 @@ msgstr "Ayr
 msgid "My Language Settings"
 msgstr "Dil Ayarlarım"
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr "Listem"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "Yerim"
 
@@ -1646,9 +1657,9 @@ msgstr "Yok"
 msgid "Name"
 msgstr "Ad"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "Yeni"
 
@@ -1676,7 +1687,7 @@ msgstr "Yeni 
 msgid "New Domain for %s"
 msgstr "%s için Yeni Alan Adı"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "Yeni Organizasyon"
 
@@ -1702,8 +1713,8 @@ msgid "News"
 msgstr "Yeni"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr "Sonraki"
 
@@ -1722,6 +1733,11 @@ msgstr "Ad Yok"
 msgid "No domains are currently listed."
 msgstr "Listelenen alan adı yok."
 
+#: www/account/49.php:50
+#, fuzzy, php-format
+msgid "No domains found matching %s"
+msgstr "%s adında bir kullanıcı bulunamadı."
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1731,7 +1747,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr "Hesabınıza bağlı böyle bir sertifika yok."
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr "Böyle bir kullanıcı bulunamadı."
 
@@ -1852,7 +1868,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr "Sadece ilk 100 satır gösterilmektedir."
 
@@ -1860,11 +1876,11 @@ msgstr "Sadece ilk 100 sat
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "Org Yöneticisi"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "Org İstemci Sertifikaları"
 
@@ -1872,7 +1888,7 @@ msgstr "Org 
 msgid "Org Client and Server Certificates"
 msgstr "Org İstemci ve Sunucu Sertifikaları"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "Org Sunucu Sertifikaları"
 
@@ -1931,7 +1947,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "Geçiş Tabiri"
 
@@ -2038,7 +2054,7 @@ msgstr ""
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "Gizlilik Politikası"
@@ -2116,7 +2132,7 @@ msgstr "K
 msgid "Root Certificate (PEM Format)"
 msgstr "Kök Sertifikası (PEM Format)"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "Kurallar"
 
@@ -2215,7 +2231,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr "Özel Hesap Ayrıntılarını Seçin"
 
@@ -2244,7 +2260,7 @@ msgstr "G
 msgid "Sensitive Information"
 msgstr "Duyarlı Bilgi"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "Sunucu Sertifikaları"
 
@@ -2326,7 +2342,7 @@ msgstr ""
 msgid "Suffix"
 msgstr "Son ek"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr "Sistem Yön."
 
@@ -2336,7 +2352,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr ""
 
@@ -2403,10 +2419,17 @@ msgstr ""
 "Organizasyonel Birim alanı serbest bir alandır. Genelde departman veya "
 "sunucu adı referans olarak kullanılmaktadır."
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr "Geçiş Tabirini çok kısa verdiniz."
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr "Geçiş Tabirini çok kısa verdiniz."
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2521,7 +2544,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr "%s e ait parola sistemde başarı ile güncellendi."
@@ -2602,7 +2625,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr "Hata oluştu ve daha ileri işlemler yapılamadı"
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -2719,7 +2742,7 @@ msgstr "
 msgid "Translations"
 msgstr "Tercümeler"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "Güvenilir Üçüncü Kişiler"
 
@@ -2812,14 +2835,14 @@ msgstr "Do
 msgid "Verified Users"
 msgstr "Doğrulandı"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "Görüntüle"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "Organizasyonları Görüntüle"
 
@@ -2827,7 +2850,7 @@ msgstr "Organizasyonlar
 msgid "Warning!"
 msgstr "Uyarı!"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -2835,7 +2858,7 @@ msgid ""
 "exposing their account, personal details and identity theft as a result."
 msgstr ""
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -2963,7 +2986,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "WoT Formu"
 
@@ -3293,7 +3316,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/locale/zh.po b/locale/zh.po
index 432db9a..d82250e 100644
--- a/locale/zh.po
+++ b/locale/zh.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: 2004-10-27 22:36-0500\n"
 "Last-Translator: Xionghui Chen <vanillalike@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -109,7 +109,7 @@ msgstr ""
 "&#x4f19;&#x5c31;&#x80fd;&#x8d8a;&#x65e9;&#x5b9e;&#x73b0;&#x6211;&#x4eec;"
 "&#x7684;&#x76ee;&#x6807;&#x3002;"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr "&#x5173;&#x4e8e;"
 
@@ -117,11 +117,11 @@ msgstr "&#x5173;&#x4e8e;"
 msgid "About CAcert.org"
 msgstr "&#x5173;&#x4e8e; CAcert.org"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr "&#x5173;&#x4e8e;&#x6211;&#x4eec;"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -300,7 +300,7 @@ msgstr ""
 msgid "Assurances Made"
 msgstr "&#x6700;&#x5927;&#x70b9;&#x6570;"
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 #, fuzzy
 msgid "Assure Someone"
 msgstr "&#x516c;&#x8bc1;&#x67d0;&#x4eba;"
@@ -329,7 +329,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr "CAcert &#x7f51;&#x7edc;&#x6258;&#x62c9;&#x65af;"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 #, fuzzy
 msgid "Becoming an Assurer"
 msgstr "&#x6210;&#x4e3a;&#x8bc1;&#x4eba;"
@@ -453,7 +453,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr "CAcert &#x6280;&#x672f;&#x652f;&#x6301;&#x5c0f;&#x7ec4;"
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 #, fuzzy
 msgid "CAcert Web of Trust"
 msgstr "CAcert &#x7f51;&#x7edc;&#x6258;&#x62c9;&#x65af;"
@@ -603,7 +603,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr "&#x66f4;&#x6539;&#x5bc6;&#x6587;"
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr "&#x66f4;&#x6539;&#x5bc6;&#x7801;"
@@ -626,7 +626,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr "&#x5ba2;&#x6237;&#x8bc1;&#x4e66;"
 
@@ -656,8 +656,8 @@ msgid "CommonName"
 msgstr "&#x901a;&#x7528;&#x540d;"
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr ""
 "&#x901a;&#x7528;&#x540d;&#x6ca1;&#x6709;&#x586b;&#x5199;&#x3002;&#x65e0;"
@@ -713,7 +713,7 @@ msgstr "&#x8054;&#x7cfb;&#x65b9;&#x5f0f;"
 msgid "Contact Email"
 msgstr "&#x8054;&#x7cfb;&#x7535;&#x5b50;&#x90ae;&#x4ef6;"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr "&#x8054;&#x7cfb;&#x6211;&#x4eec;"
@@ -783,7 +783,7 @@ msgstr "&#x51fa;&#x751f;&#x65e5;&#x671f;"
 msgid "Default"
 msgstr "&#x7f3a;&#x7701;"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 #, fuzzy
 msgid "Default Language"
 msgstr "&#x7f3a;&#x7701;"
@@ -846,7 +846,8 @@ msgid ""
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr "&#x57df;"
 
@@ -854,7 +855,7 @@ msgstr "&#x57df;"
 msgid "Domain Certificates"
 msgstr "&#x57df;&#x8ba4;&#x8bc1;"
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 #, fuzzy
 msgid "Domains"
@@ -864,7 +865,7 @@ msgstr "&#x57df;"
 msgid "Domains and Server Certificates."
 msgstr "&#x57df;&#x548c;&#x670d;&#x52a1;&#x5668;&#x8ba4;&#x8bc1;&#x3002;"
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr "&#x6350;&#x6b3e;"
@@ -890,7 +891,7 @@ msgid ""
 "downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr "&#x7f16;&#x8f91;"
@@ -905,7 +906,7 @@ msgstr "&#x7f16;&#x8f91;&#x7ec4;&#x7ec7;"
 msgid "Email"
 msgstr "&#x7535;&#x5b50;&#x90ae;&#x4ef6;"
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr "&#x7535;&#x5b50;&#x90ae;&#x4ef6;&#x8d26;&#x53f7;"
 
@@ -916,7 +917,7 @@ msgstr ""
 "&#x8ba4;&#x8bc1;"
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr "&#x7535;&#x5b50;&#x90ae;&#x4ef6;&#x5730;&#x5740;"
 
@@ -1027,11 +1028,20 @@ msgid ""
 "hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+#, fuzzy
+msgid "Find Domain"
+msgstr "&#x6dfb;&#x52a0;&#x57df;"
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 msgid "Find User"
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+msgid "Find User by Domain"
+msgstr ""
+
+#: includes/account_stuff.php:181
 msgid "Find an Assurer"
 msgstr ""
 
@@ -1098,7 +1108,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr "GPG &#x5bc6;&#x94a5;"
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr "GPG/PGP &#x5bc6;&#x94a5;"
 
@@ -1130,7 +1140,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr "&#x8fd4;&#x56de;&#x9996;&#x9875;"
 
@@ -1700,7 +1710,7 @@ msgstr "&#x4f4d;&#x7f6e;"
 msgid "Location Name"
 msgstr "&#x4f4d;&#x7f6e;&#x540d;"
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr "&#x767b;&#x5f55;"
 
@@ -1709,7 +1719,7 @@ msgstr "&#x767b;&#x5f55;"
 msgid "Logos"
 msgstr "&#x767b;&#x51fa;"
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr "&#x767b;&#x51fa;"
 
@@ -1823,7 +1833,7 @@ msgstr ""
 msgid "My Account"
 msgstr "&#x6211;&#x7684;&#x8d26;&#x53f7;"
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr "&#x6211;&#x7684;&#x63d0;&#x9192;&#x8bbe;&#x5b9a;"
 
@@ -1845,9 +1855,9 @@ msgstr "&#x6211;&#x7684;&#x63d0;&#x9192;&#x8bbe;&#x5b9a;"
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1855,7 +1865,7 @@ msgstr "&#x6211;&#x7684;&#x63d0;&#x9192;&#x8bbe;&#x5b9a;"
 msgid "My CAcert.org Account!"
 msgstr "&#x6211;&#x7684; CAcert.org &#x8d26;&#x53f7;&#xff01;"
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr "&#x6211;&#x7684;&#x8be6;&#x7ec6;&#x4fe1;&#x606f;"
@@ -1865,12 +1875,12 @@ msgstr "&#x6211;&#x7684;&#x8be6;&#x7ec6;&#x4fe1;&#x606f;"
 msgid "My Language Settings"
 msgstr "&#x6211;&#x7684;&#x63d0;&#x9192;&#x8bbe;&#x5b9a;"
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 #, fuzzy
 msgid "My Listing"
 msgstr "&#x6211;&#x7684;&#x5217;&#x8868;"
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr "&#x6211;&#x7684;&#x4f4d;&#x7f6e;"
 
@@ -1886,9 +1896,9 @@ msgstr "&#x6ca1;&#x6709;"
 msgid "Name"
 msgstr "&#x540d;&#x5b57;"
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr "&#x65b0;&#x5efa;"
 
@@ -1916,7 +1926,7 @@ msgstr "&#x65b0;&#x7684;&#x5ba2;&#x6237;&#x8bc1;&#x4e66;"
 msgid "New Domain for %s"
 msgstr "%s &#x7684;&#x65b0;&#x57df;&#x540d;"
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr "&#x65b0;&#x7ec4;&#x7ec7;"
 
@@ -1945,8 +1955,8 @@ msgid "News"
 msgstr "&#x65b0;&#x5efa;"
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 #, fuzzy
 msgid "Next"
 msgstr "&#x4e0b;&#x4e00;&#x6b65;"
@@ -1969,6 +1979,11 @@ msgstr ""
 "&#x5f53;&#x524d;&#x6ca1;&#x6709;&#x5217;&#x51fa;&#x4efb;&#x4f55;&#x57df;"
 "&#x540d;&#x3002;"
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1980,7 +1995,7 @@ msgstr ""
 "&#x4f60;&#x7684;&#x8d26;&#x53f7;&#x91cc;&#x6ca1;&#x6709;&#x8be5;&#x8bc1;"
 "&#x4e66;"
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -2124,7 +2139,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -2132,11 +2147,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr "&#x7ec4;&#x7ec7;&#x7ba1;&#x7406;&#x5458;"
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr "&#x7ec4;&#x7ec7;&#x5ba2;&#x6237;&#x8bc1;&#x4e66;"
 
@@ -2146,7 +2161,7 @@ msgstr ""
 "&#x7ec4;&#x7ec7;&#x5ba2;&#x6237;&#x548c;&#x670d;&#x52a1;&#x5668;&#x8bc1;"
 "&#x4e66;"
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr "&#x7ec4;&#x7ec7;&#x670d;&#x52a1;&#x5668;&#x8bc1;&#x4e66;"
 
@@ -2210,7 +2225,7 @@ msgid ""
 "unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr "&#x5bc6;&#x6587;"
 
@@ -2344,7 +2359,7 @@ msgstr "&#x5efa;&#x7acb;&#x8ba4;&#x8bc1;&#x8bf7;&#x6c42;"
 msgid "Privacy"
 msgstr "&#x4e2a;&#x4eba;&#x9690;&#x79c1;"
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr "&#x4fdd;&#x5b88;&#x4e2a;&#x4eba;&#x9690;&#x79c1;&#x539f;&#x5219;"
@@ -2426,7 +2441,7 @@ msgstr "&#x6839;&#x8bc1;&#x4e66;&#xff08;DER &#x683c;&#x5f0f;&#xff09;"
 msgid "Root Certificate (PEM Format)"
 msgstr "&#x6839;&#x8bc1;&#x4e66;&#xff08;PEM &#x683c;&#x5f0f;&#xff09;"
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr "&#x89c4;&#x5219;"
 
@@ -2526,7 +2541,7 @@ msgid ""
 "communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -2556,7 +2571,7 @@ msgstr "&#x53d1;&#x9001;"
 msgid "Sensitive Information"
 msgstr "&#x8054;&#x7cfb;&#x4fe1;&#x606f;"
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr "&#x670d;&#x52a1;&#x5668;&#x8bc1;&#x4e66;"
 
@@ -2656,7 +2671,7 @@ msgstr "&#x63d0;&#x4ea4;"
 msgid "Suffix"
 msgstr "&#x540e;&#x7f00;"
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -2666,7 +2681,7 @@ msgid ""
 "webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr "TTP &#x8868;"
 
@@ -2749,11 +2764,19 @@ msgid ""
 "department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr ""
 "&#x62df;&#x63d0;&#x4ea4;&#x7684;&#x5bc6;&#x6587;&#x592a;&#x77ed;&#x3002;"
 
+#: www/index.php:95
+#, fuzzy
+msgid ""
+"The Pass Phrase you submitted was too short. It must be at least 6 "
+"characters."
+msgstr ""
+"&#x62df;&#x63d0;&#x4ea4;&#x7684;&#x5bc6;&#x6587;&#x592a;&#x77ed;&#x3002;"
+
 #: www/help/2.php:59
 msgid ""
 "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' "
@@ -2944,7 +2967,7 @@ msgid ""
 "request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -3038,7 +3061,7 @@ msgstr ""
 "&#x6709;&#x9519;&#x8bef;&#x53d1;&#x751f;&#xff0c;&#x6211;&#x65e0;&#x6cd5;"
 "&#x5904;&#x7406;"
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid ""
 "There were no valid CommonName fields on the CSR, or I was unable to match "
 "any of these against your account. Please review your CSR, or add and verify "
@@ -3171,7 +3194,7 @@ msgstr "&#x57ce;&#x9547;&#xff08;&#x90ca;&#x533a;&#xff09;"
 msgid "Translations"
 msgstr "&#x7ffb;&#x8bd1;"
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr "&#x53ef;&#x4fe1;&#x7b2c;&#x4e09;&#x65b9;"
 
@@ -3267,14 +3290,14 @@ msgstr "&#x5df2;&#x6838;&#x5b9e;"
 msgid "Verified Users"
 msgstr "&#x5df2;&#x6838;&#x5b9e;"
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr "&#x5bdf;&#x770b;"
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr "&#x5bdf;&#x770b;&#x5404;&#x7ec4;&#x7ec7;"
 
@@ -3282,7 +3305,7 @@ msgstr "&#x5bdf;&#x770b;&#x5404;&#x7ec4;&#x7ec7;"
 msgid "Warning!"
 msgstr "&#x8b66;&#x544a;&#xff01;"
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid ""
 "Warning! This site requires cookies to be enabled to ensure your privacy and "
 "security. This site uses session cookies to store temporary values to "
@@ -3300,7 +3323,7 @@ msgstr ""
 "&#xff0c;&#x751a;&#x800c;&#x81ea;&#x5df1;&#x7684;&#x8eab;&#x4efd;&#x906d;"
 "&#x5230;&#x76d7;&#x7528;&#x3002;"
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid ""
 "Warning! You've attempted to log into the system with a client certificate, "
 "but the login failed due to the certificate being expired, revoked or simply "
@@ -3481,7 +3504,7 @@ msgid ""
 "if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr "WoT &#x8868;"
 
@@ -3940,7 +3963,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid ""
 "Your certificate request has failed to be processed correctly, please try "
 "submitting it again."
diff --git a/messages.po b/messages.po
index 80117b9..5100a36 100644
--- a/messages.po
+++ b/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: CAcert\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-07 01:02+1100\n"
+"POT-Creation-Date: 2004-12-07 23:35+1100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: www/account/43.php:41
+#: www/account/43.php:41 www/account/49.php:42
 #, php-format
 msgid "%s rows displayed."
 msgstr ""
@@ -71,7 +71,7 @@ msgstr ""
 msgid "ANY amount will be appreciated - the more funding CAcert receives, the sooner it can achieve the goals of the community."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "About"
 msgstr ""
 
@@ -79,11 +79,11 @@ msgstr ""
 msgid "About CAcert.org"
 msgstr ""
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 msgid "About Us"
 msgstr ""
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:152
+#: includes/account_stuff.php:149 includes/account_stuff.php:157
 #: www/account/1.php:26 www/account/16.php:21 www/account/26.php:21
 #: www/account/28.php:29 www/account/3.php:30 www/account/32.php:21
 #: www/account/33.php:47 www/account/7.php:28
@@ -203,7 +203,7 @@ msgstr ""
 msgid "Assurances Made"
 msgstr ""
 
-#: includes/account_stuff.php:176 www/wot/5.php:19
+#: includes/account_stuff.php:181 www/wot/5.php:19
 msgid "Assure Someone"
 msgstr ""
 
@@ -227,7 +227,7 @@ msgstr ""
 msgid "Become an assurer in CAcert Web of Trust"
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Becoming an Assurer"
 msgstr ""
 
@@ -288,7 +288,7 @@ msgstr ""
 msgid "CAcert Support Team"
 msgstr ""
 
-#: includes/account_stuff.php:175 www/account/0.php:27 www/wot/0.php:15
+#: includes/account_stuff.php:180 www/account/0.php:27 www/wot/0.php:15
 msgid "CAcert Web of Trust"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr ""
 msgid "Change Pass Phrase"
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/43.php:96 www/account/43.php:97
+#: includes/account_stuff.php:145 www/account/43.php:96 www/account/43.php:97
 #: www/account/44.php:19
 msgid "Change Password"
 msgstr ""
@@ -411,7 +411,7 @@ msgstr ""
 msgid "Click here to view all lists available"
 msgstr ""
 
-#: includes/account_stuff.php:147 www/account/18.php:18 www/account/5.php:18
+#: includes/account_stuff.php:152 www/account/18.php:18 www/account/5.php:18
 msgid "Client Certificates"
 msgstr ""
 
@@ -438,8 +438,8 @@ msgid "CommonName"
 msgstr ""
 
 #: includes/account.php:425 includes/account.php:444 includes/account.php:1132
-#: includes/account.php:1150 includes/account.php:1716
-#: includes/account.php:1735
+#: includes/account.php:1150 includes/account.php:1728
+#: includes/account.php:1747
 msgid "CommonName field was blank. Can't continue."
 msgstr ""
 
@@ -475,7 +475,7 @@ msgstr ""
 msgid "Contact Email"
 msgstr ""
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/40.php:15 www/index/11.php:15
 msgid "Contact Us"
 msgstr ""
@@ -537,7 +537,7 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "Default Language"
 msgstr ""
 
@@ -589,7 +589,8 @@ msgid "Disclaimer : These are the author's opinions, but they should not be cons
 msgstr ""
 
 #: www/account/26.php:24 www/account/28.php:25 www/account/29.php:31
-#: www/account/43.php:175 www/account/7.php:23
+#: www/account/43.php:175 www/account/48.php:22 www/account/49.php:33
+#: www/account/7.php:23
 msgid "Domain"
 msgstr ""
 
@@ -597,7 +598,7 @@ msgstr ""
 msgid "Domain Certificates"
 msgstr ""
 
-#: includes/account_stuff.php:151 www/account/25.php:21 www/account/25.php:38
+#: includes/account_stuff.php:156 www/account/25.php:21 www/account/25.php:38
 #: www/account/9.php:18
 msgid "Domains"
 msgstr ""
@@ -606,7 +607,7 @@ msgstr ""
 msgid "Domains and Server Certificates."
 msgstr ""
 
-#: includes/account_stuff.php:204 includes/general_stuff.php:108
+#: includes/account_stuff.php:209 includes/general_stuff.php:108
 #: www/account/38.php:15 www/index/13.php:15
 msgid "Donations"
 msgstr ""
@@ -619,7 +620,7 @@ msgstr ""
 msgid "Easy. Ish. Go to CAcert.org, install their root certificate and then follow their joining instructions. Once you have joined, request a certificate from the menu. You will receive an email with a link to the certificate. Click on the link from your email software, and hopefully it will be seamlessly installed. Next find the security section of the settings in your email software and configure digital signatures using the certificate you just downloaded. Hmm. Call me if you want, I'll guide you through it."
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/25.php:23 www/account/25.php:40
+#: includes/account_stuff.php:145 www/account/25.php:23 www/account/25.php:40
 #: www/account/26.php:25 www/account/26.php:35
 msgid "Edit"
 msgstr ""
@@ -634,7 +635,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: includes/account_stuff.php:143 www/account/2.php:18
+#: includes/account_stuff.php:148 www/account/2.php:18
 msgid "Email Accounts"
 msgstr ""
 
@@ -643,7 +644,7 @@ msgid "Email Accounts and Client Certificates"
 msgstr ""
 
 #: www/account/1.php:22 www/account/11.php:33 www/account/5.php:23
-#: www/index/1.php:69 www/index/4.php:25 www/index/5.php:21 www/help/4.php:15
+#: www/index/1.php:69 www/index/4.php:26 www/index/5.php:21 www/help/4.php:15
 msgid "Email Address"
 msgstr ""
 
@@ -734,11 +735,19 @@ msgstr ""
 msgid "Finally you will be asked information about 'extra' attribute, you simply hit enter to both these questions."
 msgstr ""
 
-#: includes/account_stuff.php:185 www/account/42.php:19
+#: includes/account_stuff.php:190
+msgid "Find Domain"
+msgstr ""
+
+#: includes/account_stuff.php:190 www/account/42.php:19
 msgid "Find User"
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: www/account/48.php:19
+msgid "Find User by Domain"
+msgstr ""
+
+#: includes/account_stuff.php:181
 msgid "Find an Assurer"
 msgstr ""
 
@@ -787,7 +796,7 @@ msgstr ""
 msgid "GPG Keys"
 msgstr ""
 
-#: includes/account_stuff.php:179
+#: includes/account_stuff.php:184
 msgid "GPG/PGP Keys"
 msgstr ""
 
@@ -811,7 +820,7 @@ msgstr ""
 msgid "Generating a New Key Pair and CSR for IIS 5.0"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Go Home"
 msgstr ""
 
@@ -1115,7 +1124,7 @@ msgstr ""
 msgid "Location Name"
 msgstr ""
 
-#: www/index/4.php:22 www/index/4.php:33
+#: www/index/4.php:23 www/index/4.php:34
 msgid "Login"
 msgstr ""
 
@@ -1123,7 +1132,7 @@ msgstr ""
 msgid "Logos"
 msgstr ""
 
-#: includes/account_stuff.php:136
+#: includes/account_stuff.php:141
 msgid "Logout"
 msgstr ""
 
@@ -1211,7 +1220,7 @@ msgstr ""
 msgid "My Account"
 msgstr ""
 
-#: includes/account_stuff.php:140 www/account/36.php:18
+#: includes/account_stuff.php:145 www/account/36.php:18
 msgid "My Alert Settings"
 msgstr ""
 
@@ -1233,9 +1242,9 @@ msgstr ""
 #: includes/account.php:1465 includes/account.php:1477
 #: includes/account.php:1540 includes/account.php:1643
 #: includes/account.php:1650 includes/account.php:1658
-#: includes/account.php:1689 includes/account.php:1715
-#: includes/account.php:1734 includes/account.php:1762
-#: includes/general.php:293 includes/general.php:370 www/account.php:40
+#: includes/account.php:1701 includes/account.php:1727
+#: includes/account.php:1746 includes/account.php:1774
+#: includes/general.php:296 includes/general.php:373 www/account.php:40
 #: www/error404.php:17 www/wot.php:22 www/wot.php:188 www/wot.php:207
 #: www/wot.php:220 www/wot.php:231 www/account/15.php:23 www/account/19.php:23
 #: www/account/19.php:42 www/account/19.php:50 www/account/23.php:23
@@ -1243,7 +1252,7 @@ msgstr ""
 msgid "My CAcert.org Account!"
 msgstr ""
 
-#: includes/account_stuff.php:139 www/account/0.php:19 www/account/13.php:23
+#: includes/account_stuff.php:144 www/account/0.php:19 www/account/13.php:23
 #: www/index/1.php:19
 msgid "My Details"
 msgstr ""
@@ -1252,11 +1261,11 @@ msgstr ""
 msgid "My Language Settings"
 msgstr ""
 
-#: includes/account_stuff.php:140 www/wot/8.php:19
+#: includes/account_stuff.php:145 www/wot/8.php:19
 msgid "My Listing"
 msgstr ""
 
-#: includes/account_stuff.php:140
+#: includes/account_stuff.php:145
 msgid "My Location"
 msgstr ""
 
@@ -1272,9 +1281,9 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: includes/account_stuff.php:148 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:180
+#: includes/account_stuff.php:153 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:185
 msgid "New"
 msgstr ""
 
@@ -1300,7 +1309,7 @@ msgstr ""
 msgid "New Domain for %s"
 msgstr ""
 
-#: includes/account_stuff.php:171 www/account/24.php:18
+#: includes/account_stuff.php:176 www/account/24.php:18
 msgid "New Organisation"
 msgstr ""
 
@@ -1325,8 +1334,8 @@ msgid "News"
 msgstr ""
 
 #: www/account/16.php:40 www/account/24.php:45 www/account/3.php:61
-#: www/account/42.php:26 www/account/44.php:30 www/index/1.php:107
-#: www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
+#: www/account/42.php:26 www/account/44.php:30 www/account/48.php:26
+#: www/index/1.php:107 www/index/5.php:53 www/index/6.php:54 www/wot/5.php:26
 msgid "Next"
 msgstr ""
 
@@ -1342,6 +1351,11 @@ msgstr ""
 msgid "No domains are currently listed."
 msgstr ""
 
+#: www/account/49.php:50
+#, php-format
+msgid "No domains found matching %s"
+msgstr ""
+
 #: www/gpg.php:131
 msgid "No emails found on your key"
 msgstr ""
@@ -1351,7 +1365,7 @@ msgstr ""
 msgid "No such certificate attached to your account."
 msgstr ""
 
-#: includes/account.php:1692
+#: includes/account.php:1704
 msgid "No such user found."
 msgstr ""
 
@@ -1436,7 +1450,7 @@ msgstr ""
 msgid "Only fill this in if you assured the person on a different day"
 msgstr ""
 
-#: www/account/43.php:37
+#: www/account/43.php:37 www/account/49.php:38
 msgid "Only the first 100 rows are displayed."
 msgstr ""
 
@@ -1444,11 +1458,11 @@ msgstr ""
 msgid "Open Directory Security folder"
 msgstr ""
 
-#: includes/account_stuff.php:170
+#: includes/account_stuff.php:175
 msgid "Org Admin"
 msgstr ""
 
-#: includes/account_stuff.php:160
+#: includes/account_stuff.php:165
 msgid "Org Client Certs"
 msgstr ""
 
@@ -1456,7 +1470,7 @@ msgstr ""
 msgid "Org Client and Server Certificates"
 msgstr ""
 
-#: includes/account_stuff.php:164
+#: includes/account_stuff.php:169
 msgid "Org Server Certs"
 msgstr ""
 
@@ -1509,7 +1523,7 @@ msgstr ""
 msgid "PLEASE NOTE: You have already assured this person before! If this is unintentional please DO NOT CONTINUE with this assurance."
 msgstr ""
 
-#: www/index/1.php:73 www/index/4.php:29
+#: www/index/1.php:73 www/index/4.php:30
 msgid "Pass Phrase"
 msgstr ""
 
@@ -1592,7 +1606,7 @@ msgstr ""
 msgid "Privacy"
 msgstr ""
 
-#: includes/account_stuff.php:205 includes/general_stuff.php:109
+#: includes/account_stuff.php:210 includes/general_stuff.php:109
 #: www/account/39.php:15 www/index/10.php:15
 msgid "Privacy Policy"
 msgstr ""
@@ -1664,7 +1678,7 @@ msgstr ""
 msgid "Root Certificate (PEM Format)"
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "Rules"
 msgstr ""
 
@@ -1732,7 +1746,7 @@ msgstr ""
 msgid "Select 'Server Certificate' at the bottom of the tab in the 'Secure communications' section."
 msgstr ""
 
-#: www/account/43.php:26
+#: www/account/43.php:26 www/account/49.php:27
 msgid "Select Specific Account Details"
 msgstr ""
 
@@ -1757,7 +1771,7 @@ msgstr ""
 msgid "Sensitive Information"
 msgstr ""
 
-#: includes/account_stuff.php:155
+#: includes/account_stuff.php:160
 msgid "Server Certificates"
 msgstr ""
 
@@ -1825,7 +1839,7 @@ msgstr ""
 msgid "Suffix"
 msgstr ""
 
-#: includes/account_stuff.php:184
+#: includes/account_stuff.php:189
 msgid "System Admin"
 msgstr ""
 
@@ -1833,7 +1847,7 @@ msgstr ""
 msgid "System will send you an email with a link in it, you just open the link in a webbrowser."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "TTP Form"
 msgstr ""
 
@@ -1873,10 +1887,14 @@ msgstr ""
 msgid "The Organisational Unit field is the 'free' field. It is often the department or Server name for reference."
 msgstr ""
 
-#: includes/account.php:810 www/index.php:95
+#: includes/account.php:810
 msgid "The Pass Phrase you submitted was too short."
 msgstr ""
 
+#: www/index.php:95
+msgid "The Pass Phrase you submitted was too short. It must be at least 6 characters."
+msgstr ""
+
 #: www/help/2.php:59
 msgid "The Regulation of Investigational Powers Act (RIPA)</a> ('Snooping Bill' official gov site, UK)"
 msgstr ""
@@ -1939,7 +1957,7 @@ msgstr ""
 msgid "The page has been reproduced on %s with explicit permission from %sthe author%s with the information being copyrighted to the author (name with held by request)"
 msgstr ""
 
-#: includes/account.php:1696
+#: includes/account.php:1708
 #, php-format
 msgid "The password for %s has been updated sucessfully in the system."
 msgstr ""
@@ -1988,7 +2006,7 @@ msgstr ""
 msgid "There was an error and I couldn't proceed"
 msgstr ""
 
-#: includes/general.php:294 includes/general.php:371
+#: includes/general.php:297 includes/general.php:374
 msgid "There were no valid CommonName fields on the CSR, or I was unable to match any of these against your account. Please review your CSR, or add and verify domains contained in it to your account before trying again."
 msgstr ""
 
@@ -2059,7 +2077,7 @@ msgstr ""
 msgid "Translations"
 msgstr ""
 
-#: includes/account_stuff.php:176 www/wot/4.php:15
+#: includes/account_stuff.php:181 www/wot/4.php:15
 msgid "Trusted Third Parties"
 msgstr ""
 
@@ -2144,14 +2162,14 @@ msgstr ""
 msgid "Verified Users"
 msgstr ""
 
-#: includes/account_stuff.php:144 includes/account_stuff.php:148
-#: includes/account_stuff.php:152 includes/account_stuff.php:156
-#: includes/account_stuff.php:161 includes/account_stuff.php:165
-#: includes/account_stuff.php:171 includes/account_stuff.php:180
+#: includes/account_stuff.php:149 includes/account_stuff.php:153
+#: includes/account_stuff.php:157 includes/account_stuff.php:161
+#: includes/account_stuff.php:166 includes/account_stuff.php:170
+#: includes/account_stuff.php:176 includes/account_stuff.php:185
 msgid "View"
 msgstr ""
 
-#: includes/account_stuff.php:171
+#: includes/account_stuff.php:176
 msgid "View Organisations"
 msgstr ""
 
@@ -2159,11 +2177,11 @@ msgstr ""
 msgid "Warning!"
 msgstr ""
 
-#: www/index/1.php:15 www/index/4.php:18
+#: www/index/1.php:15 www/index/4.php:19
 msgid "Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result."
 msgstr ""
 
-#: www/index/4.php:16
+#: www/index/4.php:17
 msgid "Warning! You've attempted to log into the system with a client certificate, but the login failed due to the certificate being expired, revoked or simply not valid for this site. You can login using your Email/Pass Phrase to get a new certificate, by clicking on 'Normal Login' to the right of your screen."
 msgstr ""
 
@@ -2243,7 +2261,7 @@ msgstr ""
 msgid "With the proposed root certificate changes, there would be a new root, this would sign at least 1 sub-root, then the private key stored offline in a bank vault, with the sub-root doing all the signing, or alternatively 2 sub-roots, 1 for client certificates, one for server, the thinking behind this, if any of the sub-roots are compromised they can be revoked and reissued."
 msgstr ""
 
-#: includes/account_stuff.php:176
+#: includes/account_stuff.php:181
 msgid "WoT Form"
 msgstr ""
 
@@ -2466,7 +2484,7 @@ msgstr ""
 #: includes/account.php:266 includes/account.php:472 includes/account.php:521
 #: includes/account.php:639 includes/account.php:989 includes/account.php:1036
 #: includes/account.php:1202 includes/account.php:1254
-#: includes/account.php:1763 www/gpg.php:165
+#: includes/account.php:1775 www/gpg.php:165
 msgid "Your certificate request has failed to be processed correctly, please try submitting it again."
 msgstr ""
 
diff --git a/pages/account/48.php b/pages/account/48.php
new file mode 100644
index 0000000..f0bb853
--- /dev/null
+++ b/pages/account/48.php
@@ -0,0 +1,30 @@
+<? /*
+    Copyright (C) 2004 by Duane Groth <duane_at_CAcert_dot_org>
+
+    This file is part of CAcert.
+
+    CAcert has been released under the CAcert Source License
+    which can be found included with these source files or can
+    be downloaded from the internet from the following address:
+    http://www.cacert.org/src-lic.php
+
+    CAcert is distributed WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A
+    PARTICULAR PURPOSE.  See the License for more details.
+*/ ?>
+<? if($_SESSION['_config']['error'] != "") { ?><div color="orange">ERROR: <?=$_SESSION['_config']['error']?></div><? unset($_SESSION['_config']['error']); } ?>
+<form method="post" action="account.php">
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="2" class="title"><?=_("Find User by Domain")?></td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Domain")?>:</td>
+    <td class="DataTD"><input type="text" name="domain" value="<?=$_POST['domain']?>"></td>
+  </tr>
+  <tr>
+    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Next")?>"></td>
+  </tr>
+</table>
+<input type="hidden" name="oldid" value="<?=$id?>">
+</form>
diff --git a/pages/account/49.php b/pages/account/49.php
new file mode 100644
index 0000000..0d6de07
--- /dev/null
+++ b/pages/account/49.php
@@ -0,0 +1,60 @@
+<? /*
+    Copyright (C) 2004 by Duane Groth <duane_at_CAcert_dot_org>
+
+    This file is part of CAcert.
+
+    CAcert has been released under the CAcert Source License
+    which can be found included with these source files or can
+    be downloaded from the internet from the following address:
+    http://www.cacert.org/src-lic.php
+
+    CAcert is distributed WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A
+    PARTICULAR PURPOSE.  See the License for more details.
+*/ ?>
+<?
+	if(intval($_GET['userid']) <= 0)
+	{
+		$domain = mysql_escape_string(stripslashes($_POST['domain']));
+		$query = "select `users`.`id` as `id`, `domains`.`domain` as `domain` from `users`,`domains`
+				where `users`.`id`=`domains`.`memid` and `domains`.`domain` like '%$domain%' and
+				`domains`.`hash`='' and `domains`.`deleted`=0
+				group by `users`.`id` limit 100";
+		$res = mysql_query($query);
+		if(mysql_num_rows($res) > 1) { ?>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="5" class="title"><?=_("Select Specific Account Details")?></td>
+  </tr>
+<?
+	while($row = mysql_fetch_assoc($res))
+	{ ?>
+  <tr>
+    <td class="DataTD"><?=_("Domain")?>:</td>
+    <td class="DataTD"><a href="account.php?id=43&userid=<?=$row['id']?>"><?=$row['domain']?></a></td>
+  </tr>
+<? } if(mysql_num_rows($res) >= 100) { ?>
+  <tr>
+    <td class="DataTD" colspan="2"><?=_("Only the first 100 rows are displayed.")?></td>
+  </tr>
+<? } else { ?>
+  <tr>
+    <td class="DataTD" colspan="2"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td>
+  </tr>
+<? } ?>
+</table><br><br>
+<?		} elseif(mysql_num_rows($res) == 1) {
+			$row = mysql_fetch_assoc($res);
+			$_GET['userid'] = $row['id'];
+		} else {
+			printf(_("No domains found matching %s"), $email);
+		}
+	}
+
+	if(intval($_GET['userid']) > 0)
+	{
+		header("location: account.php?id=43&userid=".$_GET['userid']);
+		exit;
+	}
+?>
+
diff --git a/pages/index/4.php b/pages/index/4.php
index 152a0c2..10f1efe 100644
--- a/pages/index/4.php
+++ b/pages/index/4.php
@@ -12,7 +12,8 @@
     the implied warranty of MERCHANTABILITY or FITNESS FOR A
     PARTICULAR PURPOSE.  See the License for more details.
 */ ?>
-<? if($_SESSION[_config][hostname] == "secure.cacert.org") { ?>
+<? if($_SESSION[_config][hostname] == $_SESSION['_config']['securehostname']) { ?>
+<?=$_SERVER[SSL_CLIENT_M_SERIAL]?>
 <p><?=_("Warning! You've attempted to log into the system with a client certificate, but the login failed due to the certificate being expired, revoked or simply not valid for this site. You can login using your Email/Pass Phrase to get a new certificate, by clicking on 'Normal Login' to the right of your screen.")?></p>
 <? } else { ?>
 <p><?=_("Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.")?></p>
diff --git a/www/index.php b/www/index.php
index 63ccdb4..39a381d 100644
--- a/www/index.php
+++ b/www/index.php
@@ -131,7 +131,7 @@
 		}
 	}
 
-	if($id == 4 && $_SERVER['HTTP_HOST'] == $securehostname)
+	if($id == 4 && $_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'])
 	{
 		$query = "select * from `emailcerts` where `serial`='$_SERVER[SSL_CLIENT_M_SERIAL]' and `revoked`=0 and
 				UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() > 0";