--- loncom/auth/lonlogout.pm	2012/02/07 15:19:59	1.42.2.2.2.2
+++ loncom/auth/lonlogout.pm	2012/02/13 17:03:59	1.42.2.2.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.42.2.2.2.2 2012/02/07 15:19:59 raeburn Exp $
+# $Id: lonlogout.pm,v 1.42.2.2.2.4 2012/02/13 17:03:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -127,10 +127,12 @@ sub handler {
                                       '://'.$server.$path;
                          if (($path eq '') && (!$isredirect)) {
                              my $serverhomeID =
-                                 &Apache::lonnet::get_server_homeID($lonhost);
+                                 &Apache::lonnet::get_server_homeID($server);
                              my $serverhomedom =
                                  &Apache::lonnet::host_domain($serverhomeID);
-                             if ($serverhomedom ne $domain) {
+                             if ($serverhomedom eq $domain) {
+                                 $login_url = '/adm/login';
+                             } else {
                                  $path = '/adm/login';
                                  $login_url .= $path;
                              }
@@ -162,7 +164,7 @@ Due to security reasons in new web brows
             $relogmessage.='<p>'.&mt('[_1]Log in again[_2]'
                               ,'<a href="'.$login_url.'">','</a>')
                           .('&nbsp;'x6).&mt('[_1]Return to course information page[_2]'
-                              ,'<a href="http://relate.mit.edu/mechanicscourse">'
+                              ,'<a href="http://relate.mit.edu/physicscourse">'
                               ,'</a>')
                           .'</p>';
         }