diff --git a/html/user/account_created.php b/html/user/account_created.php
index 098631dc22..c3b2be8e32 100644
--- a/html/user/account_created.php
+++ b/html/user/account_created.php
@@ -4,16 +4,22 @@
 
     $email_addr = $_GET["email_addr"];
     page_head("Account created");
+    if ($email_addr) {
+        echo "
+            <h3>Congratulations - your ".PROJECT." account has been created</h3>
+            <p>
+            Your <b>account key</b> has been emailed to $email_addr.
+            <br>
+            Please wait until you receive this email (it may take a minute or two).
+        ";
+    } else {
+        echo "<h3>Activate your ".PROJECT." account</h3>\n";
+    }
     echo "
-        <h3>Congratulations - your ".PROJECT." account has been created</h3>
-        <p>
-        Your <b>account key</b> has been emailed to $email_addr.
-        <br>
-        Please wait until you receive this email (it may take a minute or two).
         <form method=post action=login_action.php>
         <input type=hidden name=next_url value=account_setup.php>
         <table cellpadding=8>
-        <tr><td align=right>Then copy and paste the account key here:</td>
+        <tr><td align=right>Copy and paste the account key here:</td>
         <td><input name=authenticator size=40></td>
         </tr><tr>
         <td align=right>and click here:</td>
diff --git a/html/user/create_account_form.php b/html/user/create_account_form.php
index 6527e60e70..7dfb7c7b97 100644
--- a/html/user/create_account_form.php
+++ b/html/user/create_account_form.php
@@ -49,6 +49,11 @@ row2("", "<input type=submit value=\"Create account\">");
 end_table();
 echo "</form>\n";
 
+echo "If you already received an account key,
+    <a href=account_created.php>click here</a>
+    to activate your account
+";
+
 page_tail();
 
 ?>