Index: openacs.org-dev/www/templates/widgets/user-status.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/user-status.adp,v
diff -u -r1.5 -r1.6
--- openacs.org-dev/www/templates/widgets/user-status.adp	8 Nov 2002 23:44:31 -0000	1.5
+++ openacs.org-dev/www/templates/widgets/user-status.adp	2 Nov 2003 00:14:23 -0000	1.6
@@ -1,22 +1,23 @@
-              <td width="32%" NOWRAP><span class="user-status">
+              <td width="1%"><img src="/templates/slices/spacer.gif" width="5" height="1" border="0" alt=""></td>
+              <td width="15%" NOWRAP><span class="user-status">
 
 <if @login_p@ eq 1>
-logged in as<br><a href="/pvt/home">@name@</a>
+<a href="/register/logout">Log Out</a>
 </if>
 <else>
-<a href="/register/">Register</a>
+<a href="@register_url@">Log In</a>
 </else>
 
 </span></td>
 
-              <td width="1%"><img src="/templates/slices/spacer.gif" width="5" height="1" border="0" alt=""></td>
-              <td width="15%" NOWRAP><span class="user-status">
+              <td width="32%" NOWRAP><span class="user-status">
 
 <if @login_p@ eq 1>
-<a href="/register/logout">Log Out</a>
+logged in as<br><a href="/pvt/home">@name@</a>
 </if>
 <else>
-<a href="/register/">Log In</a>
+<a href="@register_url@">Register</a>
 </else>
 
 </span></td>
+
Index: openacs.org-dev/www/templates/widgets/user-status.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/user-status.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/www/templates/widgets/user-status.tcl	8 Aug 2002 16:40:52 -0000	1.1
+++ openacs.org-dev/www/templates/widgets/user-status.tcl	2 Nov 2003 00:14:23 -0000	1.2
@@ -1,6 +1,7 @@
 
 set user_id [ad_conn user_id]
-
+set return_url [ad_return_url]
+set register_url "/register/[export_vars return_url]"
 if !$user_id {
     set login_p 0
 } else {