diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/DiplomaMail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/DiplomaMail.js
index 21f4f315..bcd3be31 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/DiplomaMail.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/DiplomaMail.js
@@ -57,7 +57,7 @@ Welcome to Mail 
 In Mail, you can exchange typed messages—called
 <i>m-mail</i>&#151;with anyone who is on ${minisrv_config.config.service_name}, as well as anyone using other compatible MiniSrvs around the world. This is your m-mail address:
 <blockquote>
-<b>${session_data.getSessionData("subscriber_username")}@${minisrv_config.config.service_name}</b>
+<b>${session_data.getSessionData("subscriber_username")}@${minisrv_config.config.domain_name}</b>
 </blockquote>
 Choose <b>Begin</b> to start using Mail. <!-- Or to learn more,
 choose this link:
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/addressbook.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/addressbook.js
index 504f1d35..a456f2a7 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/addressbook.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/addressbook.js
@@ -176,7 +176,7 @@ E-mail addresses for ${session_data.getSessionData("subscriber_username")}
 <tr absheight=26>
 <td rowspan=1000 abswidth=8>
 <td colspan=3>
-Your address is ${session_data.getSessionData("subscriber_username")}@${minisrv_config.config.service_name}
+Your address is ${session_data.getSessionData("subscriber_username")}@${minisrv_config.config.domain_name}
 <tr absheight=8>
 <td colspan=3>
 <img src="wtv-home:/ROMCache/Spacer.gif" width=1 height=8>
@@ -702,7 +702,7 @@ ${(!newaddress) ? `<input type=hidden name="id" value="${request_headers.query.i
 			let addrExists = false;
 			// dumbass protection for making addresses look proper in the list
 			let address = request_headers.query.address.split("@")[0];
-			address += `@${minisrv_config.config.service_name}`;
+			address += `@${minisrv_config.config.domain_name}`;
 			// sanity checks to make sure the user doesn't have duplicate names/addresses
 			address_book.forEach(user => {
 				if (user.name.includes(request_headers.query.nickname)) {
@@ -745,7 +745,7 @@ Location: wtv-mail:/addressbook`;
 			}
 			// dumbass protection for making addresses look proper in the list
 			address = address.split("@")[0];
-			address += `@${minisrv_config.config.service_name}`;
+			address += `@${minisrv_config.config.domain_name}`;
 			nameExists = false;
 			addrExists = false;
 			if (address_book.length > 1) {
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js
index c20e6384..3b9e075b 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js
@@ -262,7 +262,7 @@ label="View saved e-mail messages">
 <font sizerange=medium> ${message_list_string}
 <table cellspacing=0 cellpadding=0 border=0>
 <TR><TD maxlines="1">
-${username}@${minisrv_config.config.service_name}
+${username}@${minisrv_config.config.domain_name}
 </TD></TR>
 </TABLE>
 </font><br>
@@ -321,7 +321,7 @@ ${message_font_close}
             data += `
 <font sizerange=medium> No ${(mailbox_name === "Inbox") ? `new e-mail messages for<table cellspacing=0 cellpadding=0 border=0>
 <TR><TD maxlines="1">
-${username}@${minisrv_config.config.service_name}
+${username}@${minisrv_config.config.domain_name}
 </TD></TR>
 </TABLE>` : 'e-mail messages in mailbox ' + mailbox_name}
 </font><br>
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js
index 263de422..e79ef5b2 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js
@@ -127,7 +127,7 @@ Content-Type: audio/wav`;
 
         const username = session_data.getSessionData("subscriber_username");
         const userdisplayname = wtvshared.htmlEntitize(session_data.getSessionData("subscriber_name"));
-        const address = username + "@" + minisrv_config.config.service_name //minisrv_config.config.domain_name
+        const address = username + "@" + minisrv_config.config.domain_name //minisrv_config.config.domain_name
         const notImplementedAlert = new clientShowAlert({
             'image': minisrv_config.config.service_logo,
             'message': "This feature is not available.",