diff --git a/checkin_notes b/checkin_notes
index b1c7d042a2..a8d6ebd780 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -22734,4 +22734,11 @@ Rom    14 Jan 2005
 
     client/win/
         win_screensaver.cpp
- 
\ No newline at end of file
+
+Karl 2005-01-16
+    - Added support for specifying db_{user,passwd} when creating projects
+
+    tools/
+        make_project
+    py/Boinc/
+        setup_project.py
diff --git a/py/Boinc/setup_project.py b/py/Boinc/setup_project.py
index 485295e640..9589837232 100644
--- a/py/Boinc/setup_project.py
+++ b/py/Boinc/setup_project.py
@@ -323,10 +323,10 @@ class Project:
         self.config = configxml.ConfigFile(self.dir('config.xml')).init_empty()
         config = self.config.config
 
-        config.long_name = self.long_name;
-        config.db_user = options.user_name
+        config.long_name = self.long_name
+        config.db_user = options.db_user
         config.db_name = db_name or options.user_name + '_' + self.short_name
-        config.db_passwd = ''
+        config.db_passwd = options.db_passwd
         config.shmem_key = generate_shmem_key()
         config.output_level = 3
         config.uldl_dir_fanout = 1024
diff --git a/tools/make_project b/tools/make_project
index 272afb1fcc..f7e0cdda51 100755
--- a/tools/make_project
+++ b/tools/make_project
@@ -48,6 +48,8 @@ Dir-options:
 
 Other:
    --db_name            default: PROJECT
+   --db_user            default: USER_NAME
+   --db_passwd          default: None
 
 Example command line:
   ./make_project --base $HOME/boinc --url_base http://boink/ yah 'YETI @ Home'
@@ -125,6 +127,8 @@ for o,a in opts:
     elif o == '--html_ops_url':  options.html_ops_url   = a
     elif o == '--cgi_url':       options.cgi_url        = a
     elif o == '--db_name':       options.db_name        = a
+    elif o == '--db_user':       options.db_user        = a
+    elif o == '--db_passwd':     options.db_passwd      = a
     # elif o == '--bin_dir':       options.bin_dir        = a
     # elif o == '--cgi_bin_dir':   options.cgi_bin_dir    = a
     # elif o == '--html_user_dir': options.html_user_dir  = a
@@ -175,6 +179,8 @@ defopt('key_dir'       , 'BASE/projects/PROJECT/keys')
 defopt('project_root'  , 'BASE/projects/PROJECT')
 
 defopt('db_name'       , 'PROJECT', isdir=False)
+defopt('db_user'       , 'USER_NAME', isdir=False)
+defopt('db_passwd'     , '', isdir=False)
 
 print "Creating project '%s' (short name '%s'):" %(project_longname, project_shortname)
 for k in ['base',