diff --git a/s4-funcs.sh b/s4-funcs.sh
index 8d91485..11e0571 100755
--- a/s4-funcs.sh
+++ b/s4-funcs.sh
@@ -1196,8 +1196,16 @@
 }
 showlogin() {
   args=`echo $myargs|tr ' ' '+'`
-  _m4 -D_SYSNAME_="Welcome" -D_MYNAME_="$myname${args+?}$args" \
-     $layout/login.m4.html
+  s4name=${S4NAME:-s4}
+  S4CSS=s4.css
+  ( sed '/^<body/q' $layout/html.m4.html
+    cat $layout/login.m4.html
+    echo '</body></html>'
+  ) | _m4 \
+	-D_BODYCLASS_="login" \
+	-D_TITLE_="$s4name" \
+	-D_SYSNAME_="Welcome to $s4name" \
+	-D_MYNAME_="$myname${args+?}$args" ${S4CSS:+-D_S4CSS_="$S4CSS"}
   exit 0
 }
 dologin() {