diff --git a/Rocksolid_Light/common/rsusers.php b/Rocksolid_Light/common/rsusers.php
index 3ca686f..95967ab 100644
--- a/Rocksolid_Light/common/rsusers.php
+++ b/Rocksolid_Light/common/rsusers.php
@@ -16,8 +16,12 @@ if (file_exists('../common/mods/style.css')) {
 include "config.inc.php";
 include($config_dir.'/phpmailer.inc.php');
 
-# The following line is required for phpmailer 6.0 or above
-#use PHPMailer\PHPMailer\PHPMailer;
+// Setup mailer
+if(class_exists('PHPMailer')) {
+  $mail = new PHPMailer();
+} else {
+  $mail = new PHPMailer\PHPMailer\PHPMailer();
+}
 
 include "head.inc";
 $CONFIG = include($config_file);
@@ -142,8 +146,6 @@ if ($ok || ($command == "Create") )
     }
   }
   if($CONFIG['verify_email']) {
-// Setup mailer
-$mail = new PHPMailer();
 
 $mail->SMTPOptions = array(
     'ssl' => array(
diff --git a/Rocksolid_Light/rslight/phpmailer.inc.php b/Rocksolid_Light/rslight/phpmailer.inc.php
index 3470eff..967cec6 100644
--- a/Rocksolid_Light/rslight/phpmailer.inc.php
+++ b/Rocksolid_Light/rslight/phpmailer.inc.php
@@ -1,19 +1,17 @@
 <?php
 # Server info and credentials for sending email
 # (sending mail requires PHPMailer package installed)
-# PHPMailer settings (comment out the versions that do not apply)
 
-# PHPMailer 6.0 and above:
-#$phpmailer['phpmailer'] = '/usr/share/php/libphp-phpmailer/src/PHPMailer.php';
-#$phpmailer['smtp'] = '/usr/share/php/libphp-phpmailer/src/SMTP.php';
-
-# PHPMailer pre 6.0
-#$phpmailer['phpmailer'] = '/usr/share/php/libphp-phpmailer/class.phpmailer.php';
-#$phpmailer['smtp'] = '/usr/share/php/libphp-phpmailer/class.smtp.php';
-
-# FreeBSD 12
-$phpmailer['phpmailer'] = '/usr/local/share/phpmailer/class.phpmailer.php';
-$phpmailer['smtp'] = '/usr/local/share/phpmailer/class.smtp.php';
+if(is_file('/usr/share/php/libphp-phpmailer/src/PHPMailer.php')) {
+  $phpmailer['phpmailer'] = '/usr/share/php/libphp-phpmailer/src/PHPMailer.php';
+  $phpmailer['smtp'] = '/usr/share/php/libphp-phpmailer/src/SMTP.php';
+} elseif(is_file('/usr/share/php/libphp-phpmailer/class.phpmailer.php')) {
+  $phpmailer['phpmailer'] = '/usr/share/php/libphp-phpmailer/class.phpmailer.php';
+  $phpmailer['smtp'] = '/usr/share/php/libphp-phpmailer/class.smtp.php'; 
+} elseif(is_file('/usr/local/share/phpmailer/class.phpmailer.php')) {
+  $phpmailer['phpmailer'] = '/usr/local/share/phpmailer/class.phpmailer.php';
+  $phpmailer['smtp'] = '/usr/local/share/phpmailer/class.smtp.php';
+}
 
 $mailer = array();
 $mailer['host'] = "mail.example.com";