--- loncom/auth/lonlogin.pm	2009/08/12 19:52:15	1.106.4.3
+++ loncom/auth/lonlogin.pm	2010/02/09 17:49:15	1.106.4.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.106.4.3 2009/08/12 19:52:15 raeburn Exp $
+# $Id: lonlogin.pm,v 1.106.4.5 2010/02/09 17:49:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -81,11 +81,15 @@ sub handler {
 	    &Apache::loncommon::start_page('Already logged in');
 	my $end_page = 
 	    &Apache::loncommon::end_page();
+        my $dest = '/adm/roles';
+        if ($env{'form.firsturl'} ne '') {
+            $dest = $env{'form.firsturl'};
+        }
 	$r->print(
                   $start_page
                  .'<h1>'.&mt('You are already logged in!').'</h1>'
                  .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
-                  '<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
+                  '<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>'
                  .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
                  .$end_page
                  );
@@ -370,7 +374,7 @@ my %lt=&Apache::lonlocal::texthash(
                   'userload' => 'User Load',
                   'about'  => 'About LON-CAPA',
                   'access' => 'Accessibility Options',
-                  'catalog' => 'Course Catalog',
+                  'catalog' => 'Course/Community Catalog',
 		  'log' => 'Log in',
 		  'help' => 'Log-in Help',
 		  'serv' => 'Server',