diff --git a/html/user/am_get_info.php b/html/user/am_get_info.php
index f857aed97d..55b854cda6 100644
--- a/html/user/am_get_info.php
+++ b/html/user/am_get_info.php
@@ -36,7 +36,8 @@ $postal_code = urlencode($user->postal_code);
 $url = urlencode($user->url);
 
 success(
-"<name>$name</name>
+"<id>$user->id</id>
+<name>$name</name>
 <country>$country</country>
 <postal_code>$postal_code</postal_code>
 <global_prefs>
diff --git a/html/user/language_select.php b/html/user/language_select.php
index 30e3439a47..b32f647cf3 100644
--- a/html/user/language_select.php
+++ b/html/user/language_select.php
@@ -54,12 +54,17 @@ for ($i=0; $i<sizeof($languages);$i++){
 //    row3($im,
     row2(
         "<a href=\"language_select.php?set_lang=".$languages[$i]."\">".$languages[$i]."</a>",
-        "<a href=\"language_select.php?set_lang=".$languages[$i]."\">".$lang_international[$i]." (".$lang_native[$i].")</a>"
+        "<a href=\"language_select.php?set_lang=".$languages[$i]."\">".$lang_international[$i]."</a>"
     );
 }
 end_table();
-echo "<p>You can always go back to automatic language selection by pressing
-    <a href=\"language_select.php?set_lang=auto\">this link</a></p>
+$prefs = $HTTP_SERVER_VARS["HTTP_ACCEPT_LANGUAGE"];
+echo "
+    <p>
+    For language selection based on your Web browser preferences,
+    <a href=\"language_select.php?set_lang=auto\">click here</a>.
+    <p>
+    Your current Web browser preferences are: <pre>$prefs</pre>
 ";
 page_tail();
 ?>
diff --git a/html/user/verify_cpid.php b/html/user/verify_cpid.php
deleted file mode 100644
index 7323e41d86..0000000000
--- a/html/user/verify_cpid.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-// "web service" for verifying that a user CPID matches an account key
-
-require_once("../inc/db.inc");
-require_once("../inc/xml.inc");
-
-db_init();
-
-xml_header();
-
-function reply($x) {
-    echo "<reply>\n$x</reply>\n";
-}
-
-$cpid = process_user_text($_GET["cpid"]);;
-$authenticator = process_user_text($_GET["authenticator"]);;
-
-if (!$cpid || !$authenticator) {
-    reply("<error>missing argument</error>\n");
-    exit();
-}
-
-$user = lookup_user_auth($authenticator);
-
-if (!$user) {
-    reply("<error>bad authenticator</error>\n");
-    exit();
-}
-
-$x = $user->cross_project_id.$user->email_addr;
-if (md5($x) == $cpid) {
-    reply( "<success></success>\n");
-} else {
-    reply( "<error>bad CPID</error>\n");
-}
-
-?>