Merge commit 'b734e614d35220ae7032adae41908ceb7e948af7'

diff --combined cgilite/users.sh
index be68a8acbe04ca0864917f92b0aef9541536429a,c924789c2e25a6fcb71b7b60eb9980373e9038ec..c924789c2e25a6fcb71b7b60eb9980373e9038ec
--- 1/cgilite/users.sh
--- 2/users.sh
+++ b/cgilite/users.sh
@@@ -29,9 -29,8 +29,8 @@@ USER_ACCOUNTPAGE="${USER_ACCOUNTPAGE}
  USER_ACCOUNTEXPIRE="${USER_ACCOUNTEXPIRE:-$((86400 * 730))}"
  USER_CONFIRMEXPIRE="${USER_CONFIRMEXPIRE:-86400}"
  
- MAILFROM="${MAILDOMAIN-noreply@${HTTP_HOST%:*}}"
- 
  HTTP_HOST="$(HEADER Host)"
+ MAILFROM="noreply@${HTTP_HOST%:*}"
  
  [ "$HTTPS" ] && SCHEMA=https || SCHEMA=http