Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/lib/login.tcl	4 Sep 2003 08:14:55 -0000	1.2
+++ openacs-4/packages/acs-subsite/lib/login.tcl	4 Sep 2003 09:20:53 -0000	1.3
@@ -12,8 +12,8 @@
     set subsite_id [subsite::get_element -element object_id]
 }
 
-if { ![info exists authority_id] } {
-    set authority_id {}
+if { ![exists_and_not_null authority_id] } {
+    set authority_id [auth::authority::local]
 }
 
 if { ![info exists username] } {
@@ -56,6 +56,9 @@
 set forgotten_pwd_url [auth::password::get_forgotten_url -authority_id $authority_id -username $username]
 
 set register_url "[subsite::get_element -element url]register/user-new"
+if { [string equal $authority_id [auth::get_register_authority]] } {
+    set register_url [export_vars -no_empty -base $register_url { username }]
+}
 
 ad_form -name login -html { style "margin: 0px;" } -show_required_p 0 -edit_buttons { { "Login" ok } } -form {
     {return_url:text(hidden)}