--- modules/gci/lonlogin.pm	2010/01/09 00:57:14	1.8
+++ modules/gci/lonlogin.pm	2010/01/11 02:31:32	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.8 2010/01/09 00:57:14 gci Exp $
+# $Id: lonlogin.pm,v 1.9 2010/01/11 02:31:32 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonlocal;
 use Apache::migrateuser();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
+use HTML::Entities();
  
 sub handler {
     my $r = shift;
@@ -82,6 +83,13 @@ sub handler {
 	my $end_page = 
 	    &Apache::loncommon::end_page();
         my $dest = '/adm/roles';
+        if ($env{'form.role'}) {
+            $dest .= '?selectrole=1&'.$env{'form.role'}.'=1'; 
+        }
+        if ($env{'form.symb'}) {
+            $dest .= ($dest =~ /\?/) ? '&' : '?'; 
+            $dest .= 'destinationurl='.&HTML::Entities::encode($env{'form.symb'},'"&<>');
+        }
         if ($env{'form.firsturl'} ne '') {
             $dest = $env{'form.firsturl'};
         }
@@ -200,7 +208,9 @@ sub handler {
         $tokenextras = '&role='.&escape($env{'form.role'});
     }
     if ($domain eq 'gci') {
-        $env{'form.symb'} = '/adm/gci_info';
+        unless ($env{'form.symb'} eq '/adm/statistics') {
+            $env{'form.symb'} = '/adm/gci_info';
+        }
     }
     if ($env{'form.symb'}) {
         if (!$tokenextras) {