diff --git a/checkin_notes b/checkin_notes
index 2b130cbfc4..df2401a140 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10259,4 +10259,18 @@ David  Mar 3 2004
 
 	client/
 		parse.C
-		util.C
\ No newline at end of file
+		util.C
+
+David  Mar 3 2004
+    - "account key" -> "account ID" in the PHP code
+
+    html/
+        inc/
+            util.inc
+        user/
+            account_created.php
+            accountsetup_nonfirst_done.php
+            create_account_form.php
+            get-passwd.php
+            login_action.php
+            mail_passwd.php
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 2bb3f12b97..9500eb7e90 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -11,10 +11,10 @@ function send_auth_email($email_addr, $auth) {
 
 ".PROJECT." URL:          ".MASTER_URL."
 
-Your account key:            $auth\n
+Your account ID:             $auth\n
 
 Please save this email.
-You will need your account key to log in to the ".PROJECT." web site."
+You will need your account ID to log in to the ".PROJECT." web site."
     );
 }
 
@@ -234,14 +234,14 @@ function print_login_form_aux($next_url, $user) {
     ";
     start_table();
     row1("Log in");
-    row2("Your account key:
+    row2("Your account ID:
         <br><font size=-2>
-        If you don't know your account key,
+        If you don't know your account ID,
         <a href=get_passwd.php>click here</a>.
         </font>",
         "<input name=authenticator size=40>"
     );
-    row2("Remember account key on this computer",
+    row2("Remember account ID on this computer",
         "<input type=checkbox name=send_cookie>"
     );
     row2("",
diff --git a/html/user/account_created.php b/html/user/account_created.php
index 878ecf2662..6fce9554e3 100644
--- a/html/user/account_created.php
+++ b/html/user/account_created.php
@@ -8,7 +8,7 @@
         echo "
             <h3>Congratulations - your ".PROJECT." account has been created</h3>
             <p>
-            Your <b>account key</b> has been emailed to $email_addr.
+            Your <b>account ID</b> has been emailed to $email_addr.
             <br>
             Please wait until you receive this email (it may take a minute or two).
         ";
@@ -19,7 +19,7 @@
         <form method=post action=login_action.php>
         <input type=hidden name=next_url value=account_setup.php>
         <table cellpadding=8>
-        <tr><td align=right>Copy and paste the account key here:</td>
+        <tr><td align=right>Copy and paste the account ID here:</td>
         <td><input name=authenticator size=40></td>
         </tr><tr>
         <td align=right>and click here:</td>
diff --git a/html/user/account_setup_nonfirst_done.php b/html/user/account_setup_nonfirst_done.php
index 203f67bebb..8b459e8251 100644
--- a/html/user/account_setup_nonfirst_done.php
+++ b/html/user/account_setup_nonfirst_done.php
@@ -18,20 +18,20 @@ echo "
         Open the BOINC application window by
         double-clicking the BOINC system tray icon.
         Choose the 'Login to Project' item in the Settings menu.
-        It will ask you for a project URL and an account key.
+        It will ask you for a project URL and an account ID.
     <li><b>Macintosh users:</b>
         Open the BOINC application window.
         Choose the 'Login to Project' item in the Settings menu.
-        It will ask you for a project URL and an account key.
+        It will ask you for a project URL and an account ID.
     <li><b>Unix and Linux users:</b>
         Quit the BOINC client.
         Then run the BOINC client program with the -add_project option.
-        It will ask you for a project URL and an account key.
+        It will ask you for a project URL and an account ID.
     </ul>
     In each case copy and paste the following:
     <ul>
     <li>Project URL: <b>".MASTER_URL."</b>
-    <li>Account key: $user->authenticator
+    <li>Account ID: $user->authenticator
     </ul>
                             
     This completes the ".PROJECT." installation.
diff --git a/html/user/create_account_form.php b/html/user/create_account_form.php
index bc20c83d8c..aa80040518 100644
--- a/html/user/create_account_form.php
+++ b/html/user/create_account_form.php
@@ -22,7 +22,7 @@ echo "
     <p><b>Read the <a href=info.php>Rules and Policies</a>
     before creating an account.</b></p>
 
-    <p>If you already received an account key, do not submit this form.
+    <p>If you already received an account ID, do not submit this form.
     <a href=account_created.php>Activate your account</a> instead.</p>
 
     <form action=create_account_action.php method=post>
diff --git a/html/user/get_passwd.php b/html/user/get_passwd.php
index a86c73cc53..5cc42bab80 100644
--- a/html/user/get_passwd.php
+++ b/html/user/get_passwd.php
@@ -4,16 +4,16 @@ require_once("../inc/db.inc");
 require_once("../inc/util.inc");
 require_once("../inc/user.inc");
 
-page_head("Account key");
+page_head("Account ID");
 
 
     echo "<form method=post action=mail_passwd.php>\n";
     start_table();
-    row1("Get your ".PROJECT." account key");
+    row1("Get your ".PROJECT." account ID");
     row2("Email address","<input size=40 name=email_addr>");
     row2("", "<input type=submit value=Submit>");
     echo "</table></form>
-        Your account key will be emailed to you.
+        Your account ID will be emailed to you.
         You should receive it in a few minutes.<p>
     ";
 
diff --git a/html/user/login_action.php b/html/user/login_action.php
index ffa929ea43..9fdcdd5442 100644
--- a/html/user/login_action.php
+++ b/html/user/login_action.php
@@ -17,7 +17,7 @@
     if (!$user) {
         page_head("Log in");
         echo "
-            We have no account with the account key '$authenticator'.
+            We have no account with the account ID '$authenticator'.
             <br>Click <b>Back</b> to try again.
         ";
         echo "<<".MASTER_URL.">>\n";
diff --git a/html/user/mail_passwd.php b/html/user/mail_passwd.php
index d0bdf1001d..f578a0f620 100644
--- a/html/user/mail_passwd.php
+++ b/html/user/mail_passwd.php
@@ -23,7 +23,7 @@ if (!$user) {
         Try reentering your email address.<p>
     ";
 } else {
-    echo "Your account key has been emailed to ".$email_addr.".<p>";
+    echo "Your account ID has been emailed to ".$email_addr.".<p>";
 }
 
 page_tail();