Merge commit 'b5b935acd56a1b3aaebf1a6b2a574807366d21fb'

diff --combined cgilite/users.sh
index b784ec75983f4163702722d8a2557e25c04ac2d7,4c730ee3753367567f6e08e527df6bd9da4f85a0..4c730ee3753367567f6e08e527df6bd9da4f85a0
--- 1/cgilite/users.sh
--- 2/users.sh
+++ b/cgilite/users.sh
@@@ -338,7 -338,7 +338,7 @@@ w_user_login()
    elif [ "$USER_ID" ]; then
      cat <<-EOF
        [form #user_login .logout method=POST
-         [p You are currently logged in as "${USER_NAME}"]
+         [p Logged in as [span . $(HTML ${USER_NAME})]]
          [submit "action" "user_logout" Logout]
        ]
        EOF