diff --git a/lang/en_utf8/mnet.php b/lang/en_utf8/mnet.php
index 505b3421901..85845e8d30a 100644
--- a/lang/en_utf8/mnet.php
+++ b/lang/en_utf8/mnet.php
@@ -242,6 +242,8 @@ $string['host'] = 'host';
 $string['loginlinkmnetuser'] = '<br />If you are a Moodle Network remote user and can <a href=\"$a\">confirm your email address here</a>, you can be redirected to your login page.<br />';
 $string['mnetidprovider'] = 'MNET ID Provider';
 $string['mnetidprovidermsg'] = 'You should be able to login at your $a provider.';
+$string['mnetidproviderdesc'] = 'You can use this facility to retrieve a link that you can log in at, if you can provide the correct email address to match the username you previously tried to log in with.';
+$string['mnetidprovidernotfound'] = 'Sorry, but no further information could be found.';
 $string['findlogin'] = 'Find Login';
 
 $string['error7020'] = 'This error normally occurs if the remote site has created a record for you with the wrong wwwroot, for example, http://yoursite.com instead of http://www.yoursite.com. You should contact the administrator of the remote site with your wwwroot (as specified in config.php) asking her to update her record for your host.';
diff --git a/login/mnet_email.php b/login/mnet_email.php
index fd2d1edbcd7..24db7190329 100644
--- a/login/mnet_email.php
+++ b/login/mnet_email.php
@@ -14,14 +14,18 @@ $mnetidprovider = get_string('mnetidprovider','mnet');
 $navigation = build_navigation(array(array('name' => $mnetidprovider, 'link' => null, 'type' => 'misc')));
 
 print_header($mnetidprovider, $mnetidprovider, $navigation, 'form.email' );
+notify(get_string('mnetidproviderdesc', 'mnet'));
 
 if ($form = data_submitted() and confirm_sesskey()) {
-    if ($user = get_record('user', 'username', $username, 'email', $form->email)) {
+    if ($user = get_record_select('user', "username = '$username' AND email = '$form->email' AND mnethostid != $CFG->mnet_localhost_id")) {
         if (!empty($user->mnethostid) and $host = get_record('mnet_host', 'id', $user->mnethostid)) {
             $link = "<a href=\"{$host->wwwroot}/login/\">{$host->name}</a>";
             notice(get_string('mnetidprovidermsg','mnet',$link));
         }
     }
+    if (empty($link)) {
+        notice(get_string('mnetidprovidernotfound', 'mnet'));
+    }
 }
 
 echo '<p>&nbsp;</p>';