diff --git a/admin/index.php b/admin/index.php
index 35f511d7d45..55597238c5c 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -635,8 +635,9 @@
         
     }
 
-    if (empty($CFG->passwordsaltmain)) {
-        print_box(get_string('upgrade197notice', 'admin')."\n".get_string('upgrade197salt', 'admin'));
+    if (empty($CFG->passwordsaltmain) || 1==1) {
+        $path = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
+        print_box(get_string('upgrade197notice', 'admin')."\n".get_string('upgrade197salt', 'admin', $path));
     }
 
     if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
diff --git a/admin/report/security/lib.php b/admin/report/security/lib.php
index 0591628cbfe..16af87a8d66 100644
--- a/admin/report/security/lib.php
+++ b/admin/report/security/lib.php
@@ -510,7 +510,8 @@ function report_security_check_passwordsaltmain($detailed=false) {
     }
 
     if ($detailed) {
-        $result->details = get_string('check_passwordsaltmain_details', 'report_security');
+        $docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
+        $result->details = get_string('check_passwordsaltmain_details', 'report_security', $docspath);
     }
 
     return $result;
diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 0796ea836ef..606306744b8 100644
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -762,8 +762,7 @@ $string['upgrade197notice'] = '<p>Moodle 1.9.7 contains a number of security fix
 As a result some of your settings and permissions relating to backups may have changed.<br />
 Please see the <a href=\'http://docs.moodle.org/en/Moodle_1.9.7_release_notes\' target=\'_blank\'>Moodle 1.9.7 release</a> notes for full details.</p>';
 $string['upgrade197noticesubject'] = 'Moodle 1.9.7 upgrade security notices';
-$string['upgrade197salt'] = 'It is also now strongly recommended that you set a password salt to greatly reduce the risk of password theft.<br />
-Please refer to the Moodle security report for more information on this topic. The security report can be accessed by logging into your site as an administrator and go to Site Administration - Security - Site policies';
+$string['upgrade197salt'] = 'It is also now strongly recommended that you set a password salt to greatly reduce the risk of password theft.<br />Please refer to the <a href=\"$a\" target=\"_blank\">password salting documentation</a> for details.</a>';
 $string['upgradeforumread'] = 'A new feature has been added in Moodle 1.5 to track read/unread forum posts.<br />To use this functionality you need to <a href=\"$a\">update your tables</a>.';
 $string['upgradeforumreadinfo'] = 'A new feature has been added in Moodle 1.5 to track read/unread forum posts.  To use this functionality you need to update your tables with all the tracking information for existing posts.  Depending on the size of your site this can take a long time (hours) and can be quite taxing on the database, so it\'s best to do it during a quiet period.  However, your site will continue functioning during this upgrade and users won\'t be affected.  Once you start this process you should let it finish (keep your browser window open).  However, if you stop the process by closing the window: don\'t worry, you can start over.<br /><br />Do you want to start the upgrading process now?';
 $string['upgradelogs'] = 'For full functionality, your old logs need to be upgraded.  <a href=\"$a\">More information</a>';
diff --git a/lang/en_utf8/report_security.php b/lang/en_utf8/report_security.php
index 5acd90fbf62..027deac53fa 100644
--- a/lang/en_utf8/report_security.php
+++ b/lang/en_utf8/report_security.php
@@ -123,10 +123,11 @@ $string['check_passwordsaltmain_name'] = 'Password salt';
 $string['check_passwordsaltmain_warning'] = 'No password salt has been set';
 $string['check_passwordsaltmain_ok'] = 'Password salt is OK';
 $string['check_passwordsaltmain_weak'] = 'Password salt is weak';
-$string['check_passwordsaltmain_details'] = '<p>It is strongly recommended that a password salt is set as it greatly reduces the risk of password theft.<br />To set a password salt add the following to your config.php file.</p><code>\$CFG->passwordsaltmain = \'a_very_long_random_string_of_characters#@6&*1\';</code>
-<p>The random string of characters should be a mix of letters, numbers and other characters.</p>
-<p>When changing main salt make sure that you include the old value in config.php, there may be 20 alternative salts. Without the old value in alternative salts list users will not be able to login and will have to use password reset.<br /><code>\$CFG->passwordsaltalt1 = \'previous_main_salt\';</code><br /></p>';
-
+$string['check_passwordsaltmain_details'] = '<p>Setting a password salt greatly reduces the risk of password theft.</p>
+<p>To set a password salt, add the following line to your config.php file:</p>
+<code>\$CFG->passwordsaltmain = \'some long random string here with lots of characters\';</code>
+<p>The random string of characters should be a mix of letters, numbers and other characters. A string length of at least 40 characters is recommended.</p>
+<p>Please refer to the <a href=\"$a\" target=\"_blank\">password salting documentation</a> if you wish to change the password salt. Once set, do NOT delete your password salt otherwise you will no longer be able to login to your site!</p>';
 $string['check_riskadmin_detailsok'] = '<p>Please verify the following list of system administrators:</p>$a';
 $string['check_riskadmin_detailswarning'] = '<p>Please verify the following list of system administrators:</p>$a->admins
 <p>It is recommended to assign administrator role in system context only. Following users have unsupported admin role assignments:</p>$a->unsupported';
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 6a3181739d4..d5761bc945d 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3195,7 +3195,8 @@ function xmldb_main_upgrade($oldversion=0) {
 
         $message = get_string('upgrade197notice', 'admin');
         if (empty($CFG->passwordmainsalt)) {
-            $message .= "\n".get_string('upgrade197salt', 'admin');
+            $docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
+            $message .= "\n".get_string('upgrade197salt', 'admin', $docspath);
         }
         notify($message, 'notifysuccess');
 
@@ -3209,7 +3210,8 @@ function xmldb_main_upgrade($oldversion=0) {
         $messagesubject = get_string('upgrade197noticesubject', 'admin');
         $message  = addslashes(get_string('upgrade197notice', 'admin'));
         if (empty($CFG->passwordmainsalt)) {
-            $message .= "\n".get_string('upgrade197salt', 'admin');
+            $docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
+            $message .= "\n".get_string('upgrade197salt', 'admin', $docspath);
         }
 
         // Force administrators to change password on next login