--- loncom/auth/lonacc.pm	2018/11/24 16:19:04	1.171
+++ loncom/auth/lonacc.pm	2018/12/17 21:43:05	1.172
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.171 2018/11/24 16:19:04 raeburn Exp $
+# $Id: lonacc.pm,v 1.172 2018/12/17 21:43:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -363,6 +363,14 @@ sub sso_login {
 	    # login but immediately go to switch server to find us a new 
 	    # machine
 	    &Apache::lonauth::success($r,$user,$domain,$home,'noredirect');
+            foreach my $item (keys(%form)) {
+                $env{'form.'.$item} = $form{$item};
+            }
+            unless ($form{'symb'}) {
+                unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) {
+                    $env{'form.origurl'} = $r->uri;
+                }
+            }
             $env{'request.sso.login'} = 1;
             if (defined($r->dir_config("lonSSOReloginServer"))) {
                 $env{'request.sso.reloginserver'} =