diff --git a/checkin_notes b/checkin_notes
index 42c2406a5e..7ca547689c 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -12487,3 +12487,14 @@ David  24 Dec 2007
     html/inc/
         forum.inc
         util.inc
+
+David  24 Dec 2007
+    - make_project: don't create symbolic link html/user_profiles/user_profiles.
+        If there was ever a need for this, it has disappeared.
+        Fixes #524
+    - fix bug in BOINC-wide team export script
+
+    html/ops/
+        team_export.php
+    py/Boinc/
+        setup_project.py
diff --git a/html/ops/team_export.php b/html/ops/team_export.php
index 8ddf8e39e7..ea82aa45d6 100755
--- a/html/ops/team_export.php
+++ b/html/ops/team_export.php
@@ -5,17 +5,16 @@
 // This script for use ONLY by the BOINC-teams project.
 // It generates an XML file with team and user info
 
-require_once("../inc/db.inc");
+require_once("../inc/boinc_db.inc");
 require_once("../inc/util.inc");
-db_init();
 
 function handle_team($team, $f) {
-    $user = lookup_user_id($team->userid);
+    $user = BoincUser::lookup_id($team->userid);
     if (!$user) {
         echo "no user for team $team->id\n";
         exit(1);
     }
-    if ($user->teamid != $team->userid) {
+    if ($user->teamid != $team->id) {
         echo "Founder is not member of $team->name\n";
         return;
     }
@@ -47,9 +46,9 @@ function handle_team($team, $f) {
 
 function main() {
     $f = fopen("temp.xml", "w");
-    $result = mysql_query("select * from team");
+    $teams = BoincTeam::enum();
     fwrite($f, "<teams>\n");
-    while ($team=mysql_fetch_object($result)) {
+    foreach($teams as $team) {
         handle_team($team, $f);
     }
     fwrite($f, "</teams>\n");
diff --git a/py/Boinc/setup_project.py b/py/Boinc/setup_project.py
index 5d59eb7fbf..124156cbd7 100644
--- a/py/Boinc/setup_project.py
+++ b/py/Boinc/setup_project.py
@@ -494,8 +494,6 @@ class Project:
 
         my_symlink(self.config.config.download_dir, self.dir('html', 'user', 'download'))
         my_symlink('../stats', self.dir('html/user/stats'))
-        my_symlink('../user_profile', self.dir('html/user/user_profile'))
-        my_symlink('../user_profile', self.dir('html/user_profile/user_profile'))
 
         # Copy the sched server in the cgi directory with the cgi names given
         # source_dir/html/user/schedulers.txt