Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.tcl	9 May 2022 16:14:54 -0000	1.1.2.2
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.tcl	21 Jun 2022 17:23:15 -0000	1.1.2.3
@@ -28,11 +28,8 @@
 if {![info exists title]}     { set title     [ad_system_name]   }
 if {![info exists signatory]} { set signatory [ad_system_owner] }
 
-if {![info exists subsite_link]} {
-    set subsite_link "/"
-}
-
-set subsite_url [subsite::get_element -element url]
+set subsite_id [ad_conn subsite_id]
+set subsite_url [subsite::get_element -subsite_id $subsite_id -element url]
 set subsite_name [lang::util::localize [subsite::get_element -element instance_name]]
 
 template::head::add_meta \
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-streaming-head.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-streaming-head.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-streaming-head.tcl	1 Apr 2022 13:38:22 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-streaming-head.tcl	21 Jun 2022 17:23:15 -0000	1.1.2.2
@@ -1,14 +1,11 @@
 set streaming_head 1
 
-if {![info exists subsite_link]} {
-    set subsite_link "/"
-}
-
 if {![info exists title]}      { set title       [ad_system_name]   }
 if {![info exists doc(title)]} { set doc(title)  $title   }
 if {[info exists context]}     { set context_bar [ad_context_bar {*}$context]}
 
-set subsite_url [subsite::get_element -element url]
+set subsite_id [ad_conn subsite_id]
+set subsite_url [subsite::get_element -subsite_id $subsite_id -element url]
 set subsite_name [lang::util::localize [subsite::get_element -element instance_name]]
 
 # Local variables:
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-master-turquois.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-master-turquois.adp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-master-turquois.adp	27 Apr 2022 16:37:23 -0000	1.1.2.3
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-master-turquois.adp	21 Jun 2022 17:23:15 -0000	1.1.2.4
@@ -5,7 +5,6 @@
 <if @focus@ not nil><property name="focus">@focus;literal@</property></if>
 <if @context@ not nil><property name="context">@context;literal@</property></if>
 <if @subsite_logo@ not nil><property name="subsite_logo">@subsite_logo;literal@</property></if>
-<if @subsite_link@ not nil><property name="subsite_link">@subsite_link;literal@</property></if>
 <property name="&navigation">navigation</property>
 
 <slave>
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-master-turquois.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-master-turquois.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-master-turquois.tcl	1 Apr 2022 13:38:22 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-master-turquois.tcl	21 Jun 2022 17:23:15 -0000	1.1.2.2
@@ -7,9 +7,6 @@
 
 set subsite_logo "/resources/openacs-bootstrap5-theme/images/logo_dotlrn_xs.png"
 
-set subsite_id [ad_conn subsite_id]
-set subsite_link [subsite::get_element -subsite_id $subsite_id -element url]
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head-turquois.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head-turquois.adp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head-turquois.adp	27 Apr 2022 16:37:23 -0000	1.1.2.3
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head-turquois.adp	21 Jun 2022 17:23:15 -0000	1.1.2.4
@@ -5,7 +5,6 @@
 <if @focus@ not nil><property name="focus">@focus;literal@</property></if>
 <if @context@ not nil><property name="context">@context;literal@</property></if>
 <if @subsite_logo@ not nil><property name="subsite_logo">@subsite_logo;literal@</property></if>
-<if @subsite_link@ not nil><property name="subsite_link">@subsite_link;literal@</property></if>
 <property name="&navigation">navigation</property>
 
 <slave>
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head-turquois.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head-turquois.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head-turquois.tcl	1 Apr 2022 13:38:22 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head-turquois.tcl	21 Jun 2022 17:23:15 -0000	1.1.2.2
@@ -8,10 +8,6 @@
 set subsite_logo "/resources/openacs-bootstrap5-theme/images/logo_dotlrn_xs.png"
 set streaming_head 1
 
-if {![info exists subsite_link]} {
-    set subsite_link "/"
-}
-
 set doc(title) $title
 ad_context_bar_multirow -- $context
 
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head.tcl	1 Apr 2022 13:38:22 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/tabbed-streaming-head.tcl	21 Jun 2022 17:23:15 -0000	1.1.2.2
@@ -10,10 +10,6 @@
 
 set streaming_head 1
 
-if {![info exists subsite_link]} {
-    set subsite_link "/"
-}
-
 set doc(title) $title
 ad_context_bar_multirow -- $context
 
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/acs-subsite/lib/login.tcl	1 Apr 2022 13:38:23 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/acs-subsite/lib/login.tcl	21 Jun 2022 17:23:15 -0000	1.1.2.2
@@ -85,7 +85,7 @@
                                 -package_id $subsite_id \
                                 -default "current-password"]
 
-set subsite_url [subsite::get_element -element url]
+set subsite_url [subsite::get_element -subsite_id $subsite_id -element url]
 set system_name [ad_system_name]
 
 if { $return_url ne "" } {
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/header-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/header-bar.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/header-bar.adp	9 Apr 2022 10:45:21 -0000	1.1.2.2
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/header-bar.adp	21 Jun 2022 17:23:15 -0000	1.1.2.3
@@ -1,7 +1,7 @@
 <nav class="navbar navbar-expand-lg bg-dark">
   <div class="container-fluid">
-    <a class="navbar-brand" href="/" style="padding:3px;">
-      <if @subsite_logo@ not nil><img src="@subsite_logo@" alt="Home"></if>
+    <a class="navbar-brand" href="@subsite_url;literal@" style="padding:3px;">
+      <if @subsite_logo@ not nil><img src="@subsite_logo;literal@" alt="Home"></if>
       <else><div>#acs-subsite.Subsite_Home#</div></else>
     </a>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-expanded="false" aria-controls="navbarSupportedContent" aria-label="Toggle navigation">