diff --git a/html/ops/db.inc b/html/ops/db.inc
index 79b22c8633..3cb750f526 100644
--- a/html/ops/db.inc
+++ b/html/ops/db.inc
@@ -240,6 +240,7 @@ function show_user($user) {
     row("Total credit", $user->total_credit);
     row("Recent averaged credit:", $user->expavg_credit);
     row("Name", $user->name);
+    row("Authenticator", $user->authenticator);
     row("Email address", $user->email_addr);
     row("Country", $user->country);
     row("Postal code", $user->postal_code);
diff --git a/html/user/account_created.php b/html/user/account_created.php
index 87996ba988..b2682cc34f 100644
--- a/html/user/account_created.php
+++ b/html/user/account_created.php
@@ -11,7 +11,7 @@
         <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=url value=account_setup.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>
         <td><input name=authenticator size=40></td>
diff --git a/html/user/bug_report_form.php b/html/user/bug_report_form.php
index 7a79898aac..3f0d3e3bf7 100644
--- a/html/user/bug_report_form.php
+++ b/html/user/bug_report_form.php
@@ -1,2 +1,52 @@
-<form method=post action=bug_report_action.php>
-</form>
+<?php
+
+include_once("util.inc");
+include_once("db.inc");
+
+function print_platform_select() {
+    echo "
+        <select name=platform>
+    ";
+
+    $result = mysql_query("select * from platform");
+    while ($platform = mysql_fetch_object($result)) {
+        echo"
+            <option value=$platform->name>$platform->user_friendly_name
+        ";
+    }
+    mysql_free_result($result);
+    echo "</select>\n";
+}
+
+$authenticator = init_session();
+db_init();
+
+$user = get_user_from_auth($authenticator);
+if ($user == NULL) {
+    print_login_form();
+    exit();
+}
+page_head("Problem Report Form", $user);
+
+echo "
+    <h3>Problem Report Form</h3>
+    <form method=post action=bug_report_action.php>
+    <table>
+    <tr><td align=right>Computer type</td><td>
+    ";
+print_platform_select();
+echo"
+    </td></tr>
+    <tr><td align=right>
+    Problem description:
+    </td><td>
+    <textarea rows=10 cols=80>
+    </textarea>
+    </td></tr>
+    <tr><td><br></td><td>
+    <input type=submit value=OK>
+    </td></tr></table>
+    </form>
+    ";
+
+?>
diff --git a/html/user/home.php b/html/user/home.php
index 91bdcdc30b..1ff2b92952 100644
--- a/html/user/home.php
+++ b/html/user/home.php
@@ -14,6 +14,6 @@
         show_user_page_private($user);
         page_tail();
     } else {
-        print_login_form();
+        print_login_form($_SERVER[REQUEST_URI]);
     }
 ?>
diff --git a/html/user/index.php b/html/user/index.php
index 04f475ddab..f2e0a92189 100644
--- a/html/user/index.php
+++ b/html/user/index.php
@@ -9,9 +9,10 @@
     project_intro();
 
     echo "
-<h3>How to join ".PROJECT." </h3>
+<h3>Join ".PROJECT." </h3>
 <p>
-<a href=create_account_form.php>Create an account</a>.
+<ul>
+<li><a href=create_account_form.php>Create an account</a>
 </ul>
 
 <h3>Returning participants</h3>
diff --git a/html/user/login_action.php b/html/user/login_action.php
index e063352660..63a6bc419c 100644
--- a/html/user/login_action.php
+++ b/html/user/login_action.php
@@ -34,9 +34,7 @@
     //    }
     } else {
         $_SESSION["authenticator"] = $user->authenticator;
-        $url = $HTTP_POST_VARS["url"];
-        Header("Location: $url");
-        //page_head("User Page");
-        //show_user_page_private($user);
+        $next_url = $HTTP_POST_VARS["next_url"];
+        Header("Location: $next_url");
     }
 ?>
diff --git a/html/user/login_form.php b/html/user/login_form.php
index af3aeff241..c608bb108a 100644
--- a/html/user/login_form.php
+++ b/html/user/login_form.php
@@ -1,24 +1,18 @@
 <?php
     require_once("util.inc");
 
-    page_head("Log in");
-    echo "<form method=post action=login_action.php>
-        <table cellpadding=8>
-        <tr><td align=right>
-        Your account key:
-        </td><td>
-        <input name=authenticator size=40>
-        </td></tr>
+    $authenticator = init_session();
+    db_init();
 
-        <tr><td align=right>
-        <br>
-        </td><td>
-        <input type=submit value='Log in'>
-        </td></tr>
-        </table>";
-    echo "<font size=1>
-          If you don't know your account key, <a href=get_passwd.php>click here</a>.<p>
-          </font>";
+    $user = get_user_from_auth($authenticator);
+
+    parse_str(getenv("QUERY_STRING"));
+    
+    page_head("Log in", $user);
+    print_login_form_aux($next_url);
+    if ($user) {
+        echo "<br><a href=logout.php>Log out</a>";
+    }
 
     page_tail();
 ?>
diff --git a/html/user/util.inc b/html/user/util.inc
index fc361b7fb4..ca4740521a 100644
--- a/html/user/util.inc
+++ b/html/user/util.inc
@@ -132,10 +132,38 @@ function print_country_select($country) {
     PassThru("$x/country_select '$country'");
 }
 
-function print_login_form() {
+function print_login_form_aux($next_url) {
+    echo "<form method=post action=login_action.php>
+        <input type=hidden name=next_url value='$next_url'>
+        <table cellpadding=8>
+        <tr><td align=right>
+        Your account key:
+        </td><td>
+        <input name=authenticator size=40>
+        </td></tr>
+
+        <tr><td align=right>
+        <br>
+        </td><td>
+        <input type=submit value='Log in'>
+        </td></tr>
+        </table>
+    ";
+    echo "<font size=1>
+        If you don't know your account key,
+        <a href=get_passwd.php>click here</a>.
+        </font>
+    ";
+}
+
+function print_login_form($next_url) {
     page_head("Please log in");
-    echo "This function requires that you be logged in.\n";
-    echo "Please <a href=login_form.php>log in</a>.\n<p>\n";
+    parse_str(getenv("QUERY_STRING"));
+    echo "
+        <h3>Please log in</h3>
+        This function requires that you log in.
+    ";
+    print_login_form_aux($next_url);
     page_tail();
 }
 
diff --git a/test/make_project_ap.php b/test/make_project_ap.php
index fe94c775fe..224535bc25 100644
--- a/test/make_project_ap.php
+++ b/test/make_project_ap.php
@@ -21,7 +21,7 @@
     $core_app_version = new App_Version($core_app);
     $core_app_version->platform = $platform;
     $core_app_version->exec_dir = "../apps";
-    $core_app_version->exec_name = "BOINC_0.12.exe";
+    $core_app_version->exec_name = "BOINC_0.13.exe";
 
     $project->add_app($app);
     $project->add_app_version($app_version);
diff --git a/test/make_project_sah.php b/test/make_project_sah.php
index 65443a5848..e62ebb7808 100644
--- a/test/make_project_sah.php
+++ b/test/make_project_sah.php
@@ -21,7 +21,7 @@
     $core_app_version = new App_Version($core_app);
     $core_app_version->platform = $platform;
     $core_app_version->exec_dir = "../apps";
-    $core_app_version->exec_name = "BOINC_0.12.exe";
+    $core_app_version->exec_name = "BOINC_0.13.exe";
 
     $project->add_app($app);
     $project->add_app_version($app_version);