diff --git a/config-dist.php b/config-dist.php
index 9836dd99e5c..4a4b0733a29 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -93,7 +93,33 @@ $CFG->dataroot  = "/home/moodledata";
 
 
 //=========================================================================
-// 5. TROUBLESHOOTING  (most people can just ignore this setting)
+// 5. DATA FILES PERMISSIONS
+//=========================================================================
+// The following parameter sets the permissions of new directories
+// created by Moodle within the data directory.  The format is in 
+// octal format (as used by the Unix utility chmod, for example).
+// The default is usually OK, but you may want to change it to 0750 
+// if you are concerned about world-access to the files (you will need
+// to make sure the web server process (eg Apache) can access the files.
+
+$CFG->directorypermissions = 0777;
+
+
+
+//=========================================================================
+// 6. ADMIN LOCATION  (most people can just ignore this setting)
+//=========================================================================
+// A very few webhosts use /admin as a special URL for you to access a 
+// control panel or something.  Unfortunately this conflicts with the 
+// standard location for the Moodle admin pages.  You can fix this by 
+// renaming the admin directory in your installation, and putting that 
+// new name here.  eg "moodleadmin".  This will fix admin links in Moodle.
+
+$CFG->admin = "admin";
+
+
+//=========================================================================
+// 7. TROUBLESHOOTING  (most people can just ignore this setting)
 //=========================================================================
 // A very small percentage of servers have a bug which causes HTTP_REFERER
 // not to work.  The symptoms of this are that you fill out the configure
@@ -105,10 +131,9 @@ $CFG->buggy_referer = false;
 
 
 //=========================================================================
-// 6. ALL DONE!  To continue your setup, visit your Moodle web page.
+// ALL DONE!  To continue your setup, visit your Moodle web page.
 //=========================================================================
 
-
 require_once("$CFG->dirroot/lib/setup.php");       // Do not change this
 
 // MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES, 
diff --git a/course/lib.php b/course/lib.php
index b1731479409..16688184761 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -625,7 +625,7 @@ function print_admin_links ($siteid, $width=180) {
 		$modicon[]=$icon;
 		$moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/lang.php\">".get_string("checklanguage")."</A>";
 		$modicon[]=$icon;
-		if (file_exists("$CFG->diradmin/$CFG->dbtype")) {
+		if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
             $moddata[]="<A HREF=\"$CFG->wwwroot/$CFG->admin/$CFG->dbtype/frame.php\">".get_string("managedatabase")."</A>";
 			$modicon[]=$icon;
 		}