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.5 -r1.1.2.6
--- openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp	23 Jun 2022 08:29:45 -0000	1.1.2.5
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp	23 Jun 2022 08:45:34 -0000	1.1.2.6
@@ -21,7 +21,7 @@
             </li>
             <li class="dropdown-divider"></li>
             <li class="dropdown-item">
-                <a href="@subsite_url;literal@register/logout" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
+                <a href="@logout_url@" 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.3 -r1.1.2.4
--- openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.tcl	21 Jun 2022 17:24:15 -0000	1.1.2.3
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.tcl	23 Jun 2022 08:45:34 -0000	1.1.2.4
@@ -22,14 +22,16 @@
 # Who's Online
 set num_users_online [lc_numeric [whos_online::num_users]]
 set whos_online_url "[subsite::get_element -element url]shared/whos-online"
-
 set return_url [ad_return_url]
+set subsite_url [site_node::get_url -node_id [ad_conn subsite_node_id]]
+
 if {!$user_id} {
     set login_p 0
     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
+    set logout_url "$subsite_url/register/logout"
     #set name [person::name -person_id $user_id]
     set name [person::get_person_info -person_id $user_id -element first_names]
 }