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.3 -r1.1.2.4
--- openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/header-bar.adp	21 Jun 2022 17:23:15 -0000	1.1.2.3
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/header-bar.adp	21 Jun 2022 17:24:15 -0000	1.1.2.4
@@ -14,7 +14,7 @@
         <if @navigation:rowcount@ defined>
           <widget src="navigation" &="navigation" ds="0" &="subsite_url" &="subsite_name">
         </if>
-        <widget src="login" ds="0" >
+        <widget src="login" ds="0" &="subsite_url">
       </ul>
     </div><!-- /.navbar-collapse -->
 
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp	21 Jun 2022 17:21:37 -0000	1.1.2.3
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp	21 Jun 2022 17:24:15 -0000	1.1.2.4
@@ -4,7 +4,7 @@
         <ul class="dropdown-menu dropdown-menu-lg-end">
             <li class="dropdown-item">
                 <!-- user greeting or login message -->
-                <a href="/pvt/home">#acs-subsite.Welcome_user#  </a>
+                <a href="@subsite_url;literal@pvt/home">#acs-subsite.Welcome_user#  </a>
             </li>
 
             <li class="dropdown-item">
@@ -21,7 +21,7 @@
             </li>
             <li class="divider"></li>
             <li class="dropdown-item">
-                <a href="/register/logout" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
+                <a href="@subsite_url;literal@register/logout" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
             </li>
         </ul>
     </li>
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.tcl	19 Jun 2022 15:33:24 -0000	1.1.2.2
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.tcl	21 Jun 2022 17:24:15 -0000	1.1.2.3
@@ -26,7 +26,7 @@
 set return_url [ad_return_url]
 if {!$user_id} {
     set login_p 0
-    set login_url [export_vars -base /register/ return_url]
+    set login_url [export_vars -base $subsite_url/register/ return_url]
     set register_url [export_vars -base /register/user-new return_url]
 } else {
     set login_p 1