diff --git a/Rocksolid_Light/common/rsusers.php b/Rocksolid_Light/common/rsusers.php
index 248cd20..2ebff8b 100644
--- a/Rocksolid_Light/common/rsusers.php
+++ b/Rocksolid_Light/common/rsusers.php
@@ -23,7 +23,7 @@ include "head.inc";
 $CONFIG = include($config_file);
 
 # $hostname: '{POPaddress:port/pop3}INBOX'
-$hostname = '{rocksolidbbs:110/pop3}INBOX';
+$hostname = '{mail.example.com:110/pop3}INBOX';
 # $external: Using external POP auth?
 $external = 0;
 # $workpath: Where to cache users (must be writable by calling program)
@@ -163,7 +163,7 @@ $mail->Username   = $mailer['username'];
 $mail->Password   = $mailer['password'];;
 $mail->SMTPSecure = 'tls';
 
-$mail->setFrom('no-reply@rocksolidbbs.com', 'no-reply');
+$mail->setFrom('no-reply@'.$mailer['host'], 'no-reply');
 $mail->addAddress($user_email);
 
 $mail->Subject = "Confirmation code for ".$_SERVER['HTTP_HOST']; 
diff --git a/Rocksolid_Light/rslight/phpmailer.inc.php b/Rocksolid_Light/rslight/phpmailer.inc.php
index 03b0fca..3470eff 100644
--- a/Rocksolid_Light/rslight/phpmailer.inc.php
+++ b/Rocksolid_Light/rslight/phpmailer.inc.php
@@ -23,7 +23,4 @@ $mailer['password'] = "password";
 
 require $phpmailer['phpmailer'];
 require $phpmailer['smtp'];
-
-# Comment out the following line if PHPMailer < 6.0
-#use PHPMailer\PHPMailer\PHPMailer;
 ?>