diff --git a/lang/en/auth.php b/lang/en/auth.php
index 5995e228967..07f1718d1d1 100644
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -49,7 +49,7 @@ $string['auth_pop3type'] = "Server type. If your server uses certificate securit
 $string['authenticationoptions'] = "Authentication options";
 $string['authinstructions'] = "Here you can provide instructions for your users, so they know which username and password they should be using.  The text you enter here will appear on the login page.  If you leave this blank then no instructions will be printed.";
 $string['changepassword'] = "Change password URL";
-$string['changepasswordhelp'] = "Here you can specify a location at which your users can recover or change their username/password if they've forgotten it.  This will be provided to users as a button on the login page.  if you leave this blank the button will not be printed.";
+$string['changepasswordhelp'] = "Here you can specify a location at which your users can recover or change their username/password if they've forgotten it.  This will be provided to users as a button on the login page and their user page.  if you leave this blank the button will not be printed.";
 $string['chooseauthmethod'] = "Choose an authentication method: ";
 $string['guestloginbutton'] = "Guest login button";
 $string['showguestlogin'] = "You can hide or show the guest login button on the login page.";
diff --git a/user/view.php b/user/view.php
index e00dd38cab0..00dc1cd3fef 100644
--- a/user/view.php
+++ b/user/view.php
@@ -121,13 +121,24 @@
 
     echo "</TD></TR></TABLE></TABLE>";
 
+    $internalpassword = false;
+    if ($CFG->auth == "email" or $CFG->auth == "none") {
+        $internalpassword = "$CFG->wwwroot/login/change_password.php";
+    }
+
 //  Print other functions
     echo "<CENTER><TABLE ALIGN=CENTER><TR>";
     if ($user->id == $USER->id and !isguest()) {
-        echo "<TD NOWRAP><P><FORM ACTION=\"$CFG->wwwroot/login/change_password.php\" METHOD=GET>";
-        echo "<INPUT type=hidden name=id value=\"$course->id\">";
-        echo "<INPUT type=submit value=\"".get_string("changepassword")."\">";
-        echo "</FORM></P></TD>";
+        if ($CFG->auth == "email" or $CFG->auth == "none") {
+            echo "<TD NOWRAP><P><FORM ACTION=\"$CFG->wwwroot/login/change_password.php\" METHOD=GET>";
+            echo "<INPUT type=hidden name=id value=\"$course->id\">";
+            echo "<INPUT type=submit value=\"".get_string("changepassword")."\">";
+            echo "</FORM></P></TD>";
+        } else if ($CFG->changepassword) {
+            echo "<TD NOWRAP><P><FORM ACTION=\"$CFG->changepassword\" METHOD=GET>";
+            echo "<INPUT type=submit value=\"".get_string("changepassword")."\">";
+            echo "</FORM></P></TD>";
+        }
     }
     if ((isstudent($course->id) and ($user->id == $USER->id) and !isguest()) or 
         (isteacher($course->id) and isstudent($course->id, $user->id)) ) {