diff --git a/checkin_notes b/checkin_notes
index 1dbc72b315..936dea71ec 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -1321,10 +1321,19 @@ David  29 Jan 2007
     lib/
         prefs.C
 
-Rom    28 Jan 2007
+Rom    29 Jan 2007
     - MGR: Update default BOINC skin.
     
     clientgui/res/skins/default/graphic
         *.xpm
     clientgui/res/templates/skins
         *.png
+
+David  29 Jan 2007
+    - core client: on Unix, raise app stack size limit to max possible value
+        before exec'ing the program.
+
+    client/
+        app_start.C
+    html/inc/
+        prefs.inc
diff --git a/client/app_start.C b/client/app_start.C
index 2ec7f88bb7..85adaba5ad 100644
--- a/client/app_start.C
+++ b/client/app_start.C
@@ -610,6 +610,16 @@ int ACTIVE_TASK::start(bool first_time) {
             _exit(retval);
         }
 
+        // set stack size limit to the max.
+        // Some BOINC apps have reported problems with exceeding
+        // small stack limits (e.g. 8 MB)
+        // and it seems like the best thing to raise it as high as possible
+        //
+        struct rlimit rlim;
+        getrlimit(RLIMIT_STACK, &rlim);
+        rlim.rlim_cur = rlim.rlim_max;
+        setrlimit(RLIMIT_STACK, &rlim);
+
         // hook up stderr to a specially-named file
         //
         freopen(STDERR_FILE, "a", stderr);
diff --git a/html/inc/prefs.inc b/html/inc/prefs.inc
index dfbc9cc443..65b54ba564 100644
--- a/html/inc/prefs.inc
+++ b/html/inc/prefs.inc
@@ -756,7 +756,7 @@ function prefs_display_venue($prefs, $venue, $subset) {
             if ($project_has_beta) prefs_show_beta($x);
             prefs_show_project($x);
         }
-        row2("<br>", "<a href=prefs_edit.php?venue=$venue&subset=$subset>Edit preferences</a> | <a href=prefs_remove.php?venue=$venue&subset=$subset$tokens>Remove</a>");
+        row2("<br>", "<a href=prefs_edit.php?venue=$venue&subset=$subset$tokens>Edit preferences</a> | <a href=prefs_remove.php?venue=$venue&subset=$subset$tokens>Remove</a>");
         end_table();
         echo "</td></tr>\n";
     } else {
@@ -795,7 +795,8 @@ function print_prefs_display_project($user, $columns=false) {
         prefs_show_privacy($user);
         venue_show($user);
         prefs_show_project($project_prefs, false);
-        row2("", "<a href=prefs_edit.php?subset=project>Edit ".PROJECT." preferences</a>");
+        $tokens = url_tokens($user->authenticator);
+        row2("", "<a href=prefs_edit.php?subset=project$tokens>Edit ".PROJECT." preferences</a>");
         end_table();
         echo "</td></tr>\n";
         prefs_display_venue($project_prefs, "home", "project");
@@ -835,7 +836,8 @@ function print_prefs_display_global($user, $columns=false) {
         echo "<tr><td colspan=2>";
         start_table("width=100% border=4");
         prefs_show_global($global_prefs);
-        row2("<br>", "<a href=prefs_edit.php?subset=global>Edit preferences</a>");
+        $tokens = url_tokens($user->authenticator);
+        row2("<br>", "<a href=prefs_edit.php?subset=global$tokens>Edit preferences</a>");
         end_table();
         echo "</td></tr>\n";