--- loncom/auth/lonacc.pm	2013/12/19 22:50:16	1.150
+++ loncom/auth/lonacc.pm	2014/01/30 12:15:12	1.153
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.150 2013/12/19 22:50:16 raeburn Exp $
+# $Id: lonacc.pm,v 1.153 2014/01/30 12:15:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -364,6 +364,11 @@ sub sso_login {
                     $info{$item} = $form{$item};
                 }
             }
+            unless ($info{'symb'}) {
+                unless (($r->uri eq '/adm/roles') || ($r->uri eq '/adm/sso')) {
+                    $info{'origurl'} = $r->uri; 
+                }
+            }
             if ($r->dir_config("ssodirecturl") == 1) {
                 $info{'origurl'} = $r->uri;
             }
@@ -397,11 +402,13 @@ sub sso_login {
             }
         }
         if (grep(/^sso$/,@cancreate)) {
-            $r->internal_redirect('/adm/createaccount');
+            $r->set_handlers('PerlHandler'=>
+                     [\&Apache::createaccount::handler]);
+            $r->handler('perl-script');
         } else {
 	    $r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect'));
+            $r->set_handlers('PerlHandler'=> undef);
         }
-	$r->set_handlers('PerlHandler'=> undef);
 	return OK;
     }
     return undef;
@@ -525,6 +532,10 @@ sub handler {
             if ($otherserver ne '') {
                 $env{'form.otherserver'} = $otherserver;
             }
+            unless (($env{'form.origurl'}) || ($r->uri eq '/adm/roles') ||
+                    ($r->uri eq '/adm/switchserver') || ($r->uri eq '/adm/sso')) {
+                $env{'form.origurl'} = $r->uri;
+            }
         }
 
 # ---------------------------------------------------------------- Check access