diff --git a/checkin_notes b/checkin_notes
index 7b7ea58da6..870045030a 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9228,10 +9228,14 @@ David  Jan 15 2004
         handle_request.C
 
 Karl 2004-01-15
+    - fixed database schema for new 'teamid' field
     - misc. fixes
 
+   db/
+       schema.sql
     py/Boinc/
         Makefile.am
+	database.py
     lib/
         Makefile.am
         base64.C
diff --git a/db/schema.sql b/db/schema.sql
index 57b59126d0..7da23b10f5 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -221,6 +221,7 @@ create table result (
     app_version_num     integer     not null,
     appid               integer     not null,
     exit_status         integer     not null,
+    teamid              integer     not null,
     primary key (id)
 );
 
diff --git a/py/Boinc/database.py b/py/Boinc/database.py
index a6b455b543..1d9c2b3996 100644
--- a/py/Boinc/database.py
+++ b/py/Boinc/database.py
@@ -220,7 +220,8 @@ class Result(DatabaseObject):
                     'opaque',
                     'random',
                     'client_version_num',
-                    'appid'
+                    'appid',
+		    'teamid'
                     ])
 
 class Workseq(DatabaseObject):
diff --git a/py/Boinc/setup_project.py b/py/Boinc/setup_project.py
index eb215fe0b5..6d1feb0018 100644
--- a/py/Boinc/setup_project.py
+++ b/py/Boinc/setup_project.py
@@ -299,7 +299,7 @@ class Project:
         config = self.config.config
 
         config.db_user = options.user_name
-        config.db_name = db_name or config.user_name + '_' + self.short_name
+        config.db_name = db_name or options.user_name + '_' + self.short_name
         config.db_passwd = ''
         config.shmem_key = generate_shmem_key()
         config.output_level = 3