diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/message.hbs
index a1251862..9fdfc3a7 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Someone has requested deletion of your account named '{{account.name}}' on {{network.networkDomain}}
+Someone has requested deletion of your account named '{{account.name}}' on {{network.nickname}}
 
 The account deletion request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/subject.hbs
index 91b659cd..c46184ff 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/delete/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account Deletion Approval Received -- {{account.name}} on {{network.networkDomain}}
\ No newline at end of file
+Account Deletion Approval Received -- {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/message.hbs
index ab6b82c9..d11563a0 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-A request to download account data for the account named '{{account.name}}' on {{network.networkDomain}} has been approved.
+A request to download account data for the account named '{{account.name}}' on {{network.nickname}} has been approved.
 
 The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/subject.hbs
index 9e2596bc..f436d552 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/download/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Download account data approved for {{account.name}}
\ No newline at end of file
+Download account data approved for {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/message.hbs
index fc2d808d..4b45f749 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Someone is trying to log in to the account named '{{account.name}}' on {{network.networkDomain}}
+Someone is trying to log in to the account named '{{account.name}}' on {{network.nickname}}
 
 The login request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.request.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/subject.hbs
index f57378b4..e272aba9 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/login/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account Login Approval Received -- {{account.name}} on {{network.networkDomain}}
\ No newline at end of file
+Account Login Approval Received -- {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/message.hbs
index 49f68ed7..add18b57 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-The password for the account named '{{account.name}}' on {{network.networkDomain}} has been reset.
+The password for the account named '{{account.name}}' on {{network.nickname}} has been reset.
 
 The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/subject.hbs
index d4c294d4..69a3e8fb 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Password Successfully Reset for {{account.name}}
\ No newline at end of file
+Password Successfully Reset for {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/message.hbs
index 509fa0c2..6b06681f 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-The "View Network Keys" request for {{network.networkDomain}} has been approved.
+The "View Network Keys" request for {{network.nickname}} has been approved.
 
 The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/subject.hbs
index 027c2b0e..ba98a04c 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: View Network Keys: request approved
\ No newline at end of file
+View Network Keys: request approved on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/message.hbs
index 403e4fa6..9ecdb074 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Your account named '{{account.name}}' on {{network.networkDomain}} has been deleted.
+Your account named '{{account.name}}' on {{network.nickname}} has been deleted.
 
 The account deletion request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/subject.hbs
index c5138529..dece4d49 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/delete/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account Deletion Completed -- {{account.name}} on {{network.networkDomain}} has been permanently deleted
\ No newline at end of file
+Account Deletion Completed -- {{account.name}} on {{network.nickname}} has been permanently deleted
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/message.hbs
index 4248f0e6..b59cdc52 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-The download request for the account named '{{account.name}}' on {{network.networkDomain}} has been confirmed
+The download request for the account named '{{account.name}}' on {{network.nickname}} has been confirmed
 
 The request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/subject.hbs
index 79a6130a..27593088 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/download/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Download Account Data for: {{account.name}}
\ No newline at end of file
+Download Account Data for: {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/message.hbs
index 20c649d6..31bdc6a5 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-A successful login has been made to the account named '{{account.name}}' on {{network.networkDomain}}
+A successful login has been made to the account named '{{account.name}}' on {{network.nickname}}
 
 The login request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/subject.hbs
index efec0273..9772b0d1 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/login/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account Login Confirmed -- {{account.name}} on {{network.networkDomain}} has been permanently deleted
\ No newline at end of file
+Account Login Confirmed -- {{account.name}} on {{network.nickname}} has been permanently deleted
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/message.hbs
index 0ceccfaa..a8956aea 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-The password for the account named '{{account.name}}' on {{network.networkDomain}} has been reset.
+The password for the account named '{{account.name}}' on {{network.nickname}} has been reset.
 
 The password reset request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/subject.hbs
index 62c7d27d..d5976845 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account Password Reset: {{account.name}}
\ No newline at end of file
+Account Password Reset: {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/message.hbs
index 98c47543..5cfe5605 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-The "View Network Keys" request {{network.networkDomain}} has been confirmed.
+The "View Network Keys" request {{network.nickname}} has been confirmed.
 
 The request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/subject.hbs
index f30fc435..e1f5023e 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: View Your Network Keys
\ No newline at end of file
+View Your Network Keys for {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/message.hbs
index efae1656..41a6a3cf 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Contact information for your account named '{{account.name}}' on {{network.networkDomain}} has been successfully verified:
+Contact information for your account named '{{account.name}}' on {{network.nickname}} has been successfully verified:
 
 {{contact.type}} - {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/subject.hbs
index 8c1236a4..e5ec84a4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/verify/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Addition of {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been successfully verified
\ No newline at end of file
+Addition of {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been successfully verified on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/message.hbs
index 50e91b7f..aeb9ce66 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Someone has requested deletion of your account named '{{account.name}}' on {{network.networkDomain}}
+Someone has requested deletion of your account named '{{account.name}}' on {{network.nickname}}
 
 The account deletion request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/subject.hbs
index aad93868..14c82a46 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/delete/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account Deletion Denied -- {{account.name}} on {{network.networkDomain}}
\ No newline at end of file
+Account Deletion Denied -- {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/message.hbs
index 96f254ec..ce375a89 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-The download request for the account named '{{account.name}}' on {{network.networkDomain}} has been canceled.
+The download request for the account named '{{account.name}}' on {{network.nickname}} has been canceled.
 
 The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/subject.hbs
index b6940cc9..890bc42c 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/download/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Download account data denied for account: {{account.name}}
\ No newline at end of file
+Download account data denied for account: {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/message.hbs
index 92117daf..d05db806 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Someone is trying to log in to the account named '{{account.name}}' on {{network.networkDomain}}
+Someone is trying to log in to the account named '{{account.name}}' on {{network.nickname}}
 
 The login request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/subject.hbs
index 25a695b8..31a91a84 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/login/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account Login Approval Denied -- {{account.name}} on {{network.networkDomain}}
\ No newline at end of file
+Account Login Approval Denied -- {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/message.hbs
index e6a11c3e..39449daf 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-The reset password request for the account named '{{account.name}}' on {{network.networkDomain}} has been canceled.
+The reset password request for the account named '{{account.name}}' on {{network.nickname}} has been canceled.
 
 The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/subject.hbs
index f068e138..6cb025d7 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Password Reset was canceled for {{account.name}}
\ No newline at end of file
+Password Reset was canceled for {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/message.hbs
index 4304d4d9..32c9e8d0 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-The "View Network Keys" request for {{network.networkDomain}} has been canceled.
+The "View Network Keys" request for {{network.nickname}} has been canceled.
 
 The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/subject.hbs
index 996e9e2c..88a82000 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/password/network/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: View Network Keys: request denied
\ No newline at end of file
+View Network Keys: request denied on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/message.hbs
index b16da72d..7caba7d9 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Contact information for your account named '{{account.name}}' on {{network.networkDomain}} has been denied and removed:
+Contact information for your account named '{{account.name}}' on {{network.nickname}} has been denied and removed:
 
 {{contact.type}} - {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/subject.hbs
index 4bed5f64..d878421a 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/denial/verify/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Addition of {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been denied
\ No newline at end of file
+Addition of {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been denied on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/subject.hbs
index e44651d1..3cdabb42 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/notice/payment/network/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Bubble stopped due to non-payment. Please pay now to resume service.
\ No newline at end of file
+Bubble {{network.nickname}} stopped due to non-payment. Please pay now to resume service.
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/message.hbs
index 1eba54c0..9d4e033f 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/message.hbs
@@ -1,16 +1,21 @@
 Hello {{account.name}},
 
-Congratulations, your new Bubble is launching. It typically takes about 20 minutes to set itself up.
+Congratulations, your new Bubble is launching!
 
-When your Bubble has finished its self-setup process, it will send you a message with a link to unlock it.
+When your Bubble finishes the self-setup process, it will send you a message letting you know it's ready to use.
 
-You'll need to install the WireGuard application on each device that will connect to your Bubble.
+While you're waiting for your Bubble to be ready, please install the Bubble app on your devices:
 
-While you're waiting for your Bubble to be ready, go ahead and install the WireGuard application on each
-device you will connect to your Bubble.
+  * Android -- {{appLinks.android}}
 
-Instruction for installing WireGuard can be found here: https://github.com/bubblev/bubble-docs/blob/master/wg_setup/README.md
+  * iOS (iPhone and iPad) -- {{appLinks.ios}}
 
-If you have any difficulties installing WireGuard or using your new Bubble, please contact support@bubblev.com
+  * Windows 7 and higher -- {{appLinks.windows}}
 
+  * MacOS X -- {{appLinks.macosx}}
+
+  * Linux -- {{appLinks.linux}}
+
+{{#if support.hasInfo}}If you have any questions or need help, please {{#if support.hasEmailAndSite}}visit our support site: {{support.site}} or contact us at {{support.email}}{{else}}{{#if support.hasEmail}}contact {{support.email}}{{else}}visit {{support.site}}{{/if}}{{/if}}
+{{/if}}
 Thank you for using Bubble!
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/subject.hbs
index 5dc63e4a..d8f601f7 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/notice/start/network/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Your new Bubble is launching
\ No newline at end of file
+Your new Bubble is launching: {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/message.hbs
index 9dafcc65..dd1c9cf3 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/message.hbs
@@ -6,6 +6,6 @@ Please confirm your email address using this link:
 
 {{publicUri}}/me/action?approve={{confirmationToken}}
 
-{{#if configuration.hasSupportInfo}}If you have any questions or need help, please {{#if configuration.support.hasEmailAndSite}}contact {{configuration.support.email}} or visit {{configuration.support.site}}{{else}}{{#if configuration.support.hasEmail}}contact {{configuration.support.email}}{{else}}visit {{configuration.support.site}}{{/if}}{{/if}}{{/if}}
-
-Happy bubbling!
+{{#if support.hasInfo}}If you have any questions or need help, please {{#if support.hasEmailAndSite}}visit our support site: {{support.site}} or contact us at {{support.email}}{{else}}{{#if support.hasEmail}}contact {{support.email}}{{else}}visit {{support.site}}{{/if}}{{/if}}
+{{/if}}
+Thank you for using Bubble!
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/subject.hbs
index 883a0006..abc9489a 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/notice/welcome/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Welcome to Bubble!
\ No newline at end of file
+Welcome to Bubble!
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/message.hbs
index 1821f0fb..cdecb8dd 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Someone has requested deletion of your account named '{{account.name}}' on {{network.networkDomain}}
+Someone has requested deletion of your account named '{{account.name}}' on {{network.nickname}}
 
 The account deletion request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/subject.hbs
index 91362e60..279eeb5f 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/delete/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account Deletion Requested -- Please Confirm Deletion of {{account.name}} on {{network.networkDomain}}
\ No newline at end of file
+Account Deletion Requested -- Please Confirm Deletion of {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/message.hbs
index 3f55a1f5..e8afcece 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Someone is trying to download all account data for the account named '{{account.name}}' on {{network.networkDomain}}
+Someone is trying to download all account data for the account named '{{account.name}}' on {{network.nickname}}
 
 The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/subject.hbs
index 606a8a4f..df821e37 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/download/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Download all account data requested for account: {{account.name}}
\ No newline at end of file
+Download all account data requested for account: {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/message.hbs
index 65eb6c6b..113e1f67 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Someone is trying to log in to the account named '{{account.name}}' on {{network.networkDomain}}
+Someone is trying to log in to the account named '{{account.name}}' on {{network.nickname}}
 
 The login request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/subject.hbs
index 1b995a38..2794c5d0 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/login/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account Login -- Please Confirm Login for {{account.name}} on {{network.networkDomain}}
\ No newline at end of file
+Account Login -- Please Confirm Login for {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/message.hbs
index d9b4bcc3..31058a17 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Someone is trying to reset the password for the account named '{{account.name}}' on {{network.networkDomain}}
+Someone is trying to reset the password for the account named '{{account.name}}' on {{network.nickname}}
 
 The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/subject.hbs
index 06f1bf91..133e7521 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Password Reset for {{account.name}}
\ No newline at end of file
+Password Reset for {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/message.hbs
index 5f3fb03e..b2ff251f 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Someone has requested the network keys for {{network.networkDomain}}
+Someone has requested the network keys for {{network.nickname}}
 
 The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}.
 
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/subject.hbs
index edfc490f..fa8ca5d6 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: View Network Keys requested
\ No newline at end of file
+View Network Keys requested on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/payment/network/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/payment/network/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/payment/network/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/payment/network/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/payment/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/payment/network/subject.hbs
index 3b5beaab..2145973c 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/payment/network/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/payment/network/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Payment required for your Bubble
\ No newline at end of file
+Payment required for your Bubble: {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/message.hbs
index 6652b8f9..64742d4c 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/message.hbs
@@ -1,6 +1,6 @@
 Hello {{account.name}},
 
-Contact information has been added to your account named '{{account.name}}' on {{network.networkDomain}}
+Contact information has been added to your account named '{{account.name}}' on {{network.nickname}}
 
 {{#string_compare contact.uuid '==' message.contact}}{{contact.type}} - {{contact.info}}{{else}}{{message.requestContact.type}}{{#if message.requestContact.isSms}}{{message.requestContact.info}}{{/if}}{{/string_compare}} {{#if message.requestContact.nick}}({{message.requestContact.nick}}){{/if}}
 {{#string_compare contact.uuid '==' message.contact}}
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/subject.hbs
index c3acdf24..4d36d670 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/account/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Verification Requested: {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}
\ No newline at end of file
+Verification Requested: {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/fromName.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/fromName.hbs
index 1178b0e8..08dc8cb4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/fromName.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/fromName.hbs
@@ -1 +1 @@
-{{network.networkDomain}} System Account
\ No newline at end of file
+{{network.nickname}} System Account
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/message.hbs
index 4e39d214..43b0213d 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/message.hbs
@@ -1,11 +1,28 @@
 Hello {{account.name}},
 
-Your new Bubble is running, follow the link below to login and begin using it:
+Your new Bubble is running!
+{{#if message.data}}
+Follow the link below to unlock it:
 
-  {{publicUri}}/login{{#if message.data}}?k={{message.data}}{{/if}}
+  {{publicUri}}/login?k={{message.data}}
 
-{{#if message.data}}This link will expire in 48 hours.
+This link will expire in 48 hours. If you do not start using your Bubble within 48 hours, you will need to relaunch a new Bubble.
 
-If you do not start using your Bubble within 48 hours, you will need to relaunch a new Bubble.{{/if}}
+After you've unlocked your Bubble, you can use of our apps listed below to connect.
+{{/if}}
 
+Please install the Bubble app on your devices:
+
+  * Android -- {{appLinks.android}}
+
+  * iOS (iPhone and iPad) -- {{appLinks.ios}}
+
+  * Windows 7 and higher -- {{appLinks.windows}}
+
+  * MacOS X -- {{appLinks.macosx}}
+
+  * Linux -- {{appLinks.linux}}
+
+{{#if support.hasInfo}}If you have any questions or need help, please {{#if support.hasEmailAndSite}}visit our support site: {{support.site}} or contact us at {{support.email}}{{else}}{{#if support.hasEmail}}contact {{support.email}}{{else}}visit {{support.site}}{{/if}}{{/if}}
+{{/if}}
 Thank you for using Bubble!
diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/subject.hbs
index 58b7611f..5878e94d 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/subject.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/verify/network/subject.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Your new Bubble is ready for you
\ No newline at end of file
+Your new Bubble is ready for you: {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
index 2fd4d33b..007ebdc4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
+++ b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
@@ -385,8 +385,16 @@ meter_unknown_error=An unknown error occurred
 
 # Help text shown during launch
 title_launch_help_html=Next Steps
-message_launch_help_html=<p>Your Bubble will take about 10 minutes to launch and configure itself.</p><p>When your Bubble has completed its setup, it will send you an email message with a link to unlock it and start using it.</p><p>While you wait for your Bubble to be ready, please <a href="https://github.com/bubblev/bubble-docs/blob/master/wg_setup/README.md">install WireGuard</a> on each device that you will be connecting to your Bubble.</p><p>If you run into any trouble installing WireGuard or setting up your Bubble, please contact <a href="mailto:support@getbubblenow.com">support@getbubblenow.com</a></p>
-message_launch_success_help_html=<p>Congratulations! Your Bubble is now running.</p><p>Check your email for a message from your Bubble. It should contain a link to unlock it and start using it.</p><p>Follow that link to begin using your Bubble, it will guide you through the process to connect your various devices to it.</p><p>If you run into any trouble setting up your Bubble, please contact <a href="mailto:support@getbubblenow.com">support@getbubblenow.com</a></p>
+
+message_launch_help_html=<p>Your Bubble will take about 10 minutes to launch and configure itself.</p>\
+<p>If you run into any trouble setting up your Bubble, please contact <a href="mailto:support@getbubblenow.com">support@getbubblenow.com</a></p>
+
+message_launch_help_apps=While you wait for your Bubble to be ready, please install the Bubble app on each of your devices.
+
+message_launch_success_help_html=<p>Congratulations! Your Bubble is now running.</p>\
+<p>If you run into any trouble setting up your Bubble, please contact <a href="mailto:support@getbubblenow.com">support@getbubblenow.com</a></p>
+
+message_launch_success_apps=Install the Bubble app on each of your devices and get connected to your Bubble!
 
 # Network statuses
 msg_network_state_created=initialized
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/delete/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/delete/account/message.hbs
index 4411ec7e..308af22e 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/delete/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/delete/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Approval for account deletion received: {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
\ No newline at end of file
+Approval for account deletion received: {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/download/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/download/account/message.hbs
index b9991c76..bd6d051a 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/download/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/download/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Download account {{account.name}} approved: {{publicUri}}/me/download/{{message.requestId}}
\ No newline at end of file
+Download account {{account.name}} approved: {{publicUri}}/me/download/{{message.requestId}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/login/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/login/account/message.hbs
index c70d3c07..2441f5f9 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/login/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/login/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Approval for account login received: {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
\ No newline at end of file
+Approval for account login received: {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/account/message.hbs
index d4c294d4..69a3e8fb 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Password Successfully Reset for {{account.name}}
\ No newline at end of file
+Password Successfully Reset for {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/network/message.hbs
index d90e25a7..8897531d 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/network/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Viewing network keys: approved
\ No newline at end of file
+Viewing network keys: approved on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/delete/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/delete/account/message.hbs
index 7c9a17ea..0d2a0e5e 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/delete/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/delete/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Your account named '{{account.name}}' on {{network.networkDomain}} has been deleted. This action is irrevocable.
\ No newline at end of file
+Your account named '{{account.name}}' on {{network.nickname}} has been deleted. This action is irrevocable.
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/download/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/download/account/message.hbs
index fef9069b..59b19f75 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/download/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/download/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Download account {{account.name}} here: {{publicUri}}/me/download?t={{confirmationToken}}
\ No newline at end of file
+{{network.nickname}}: Download account {{account.name}} here: {{publicUri}}/me/download?t={{confirmationToken}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/login/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/login/account/message.hbs
index e9679a69..19a88573 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/login/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/login/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account login permitted by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
\ No newline at end of file
+Account login permitted by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/verify/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/verify/account/message.hbs
index debaa73d..f01ac480 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/verify/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/verify/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been successfully verified
\ No newline at end of file
+{{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been successfully verified on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/delete/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/delete/account/message.hbs
index 602901cc..bd2f9510 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/delete/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/delete/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account deletion denied by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
\ No newline at end of file
+Account deletion denied by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/download/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/download/account/message.hbs
index a62568b1..de9852d9 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/download/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/download/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Download account {{account.name}} denied by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
\ No newline at end of file
+Download account {{account.name}} denied by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/login/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/login/account/message.hbs
index 2cae5ac4..6894c079 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/login/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/login/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Account login denied by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
\ No newline at end of file
+Account login denied by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/password/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/password/account/message.hbs
index f068e138..6cb025d7 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/password/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/password/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Password Reset was canceled for {{account.name}}
\ No newline at end of file
+Password Reset was canceled for {{account.name}} on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/password/network/message.hbs
index f181e851..d6fcf1be 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/password/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/password/network/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Viewing network keys: denied
\ No newline at end of file
+Viewing network keys: denied on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/verify/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/verify/account/message.hbs
index cffd1569..de2e32ca 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/denial/verify/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/denial/verify/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: {{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been denied and removed
\ No newline at end of file
+{{contact.type}} / {{contact.info}} {{#if contact.nick}}({{contact.nick}}) {{/if}}has been denied and removed on {{network.nickname}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/notice/payment/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/notice/payment/network/message.hbs
index 6385622e..b1862dd8 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/notice/payment/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/notice/payment/network/message.hbs
@@ -1 +1 @@
-Bubble {{network.networkDomain}} stopped due to non-payment, to resume service: {{publicUri}}/me/plans/{{message.data}}/bills
\ No newline at end of file
+Bubble {{network.nickname}} stopped due to non-payment, to resume service: {{publicUri}}/me/plans/{{message.data}}/bills
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/notice/welcome/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/notice/welcome/account/message.hbs
index 88fce205..2a8b9b40 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/notice/welcome/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/notice/welcome/account/message.hbs
@@ -1,2 +1,2 @@
-{{network.networkDomain}}: Welcome to Bubble, {{account.name}}!
+Welcome to Bubble!
 Verify your email: {{publicUri}}/me/action?approve={{confirmationToken}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/request/delete/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/request/delete/account/message.hbs
index 51da663b..97bca5e3 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/request/delete/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/request/delete/account/message.hbs
@@ -1,2 +1,2 @@
-{{network.networkDomain}}: Account deletion requested by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}}
+Account deletion requested by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{network.nickname}}
 Use deletion code {{confirmationToken}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/request/download/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/request/download/account/message.hbs
index 57c49cbd..94582525 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/request/download/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/request/download/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Download account {{account.name}} requested: {{publicUri}}/action?approve={{confirmationToken}}
\ No newline at end of file
+Download account {{account.name}} on {{network.nickname}} requested: {{publicUri}}/action?approve={{confirmationToken}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/request/login/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/request/login/account/message.hbs
index 376c17c7..4e293c32 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/request/login/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/request/login/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Login requested by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} Use code to login: {{confirmationToken}} or to deny request: {{publicUri}}/action?deny={{confirmationToken}}
\ No newline at end of file
+Login to {{network.nickname}} requested by {{contact.type}}/{{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} Use code to login: {{confirmationToken}} or to deny request: {{publicUri}}/action?deny={{confirmationToken}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/account/message.hbs
index 90ba30fa..fba97cdd 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/account/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: Reset password: {{publicUri}}/action?approve={{confirmationToken}}&user={{urlEncode account.name}}
\ No newline at end of file
+Reset password on {{network.nickname}}: {{publicUri}}/action?approve={{confirmationToken}}&user={{urlEncode account.name}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/network/message.hbs
index 921a4375..7852e3f5 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/network/message.hbs
@@ -1 +1 @@
-{{network.networkDomain}}: approve viewing network keys: {{publicUri}}/action?approve={{confirmationToken}}
\ No newline at end of file
+Approve viewing network keys on {{network.nickname}}: {{publicUri}}/action?approve={{confirmationToken}}
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/request/payment/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/request/payment/network/message.hbs
index 5429da28..8b0f51c1 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/request/payment/network/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/request/payment/network/message.hbs
@@ -1 +1 @@
-Payment failed for {{network.networkDomain}}. Please pay here: {{publicUri}}/me/plans/{{message.data}}/bills
\ No newline at end of file
+Payment failed for {{network.nickname}}. Please pay here: {{publicUri}}/me/plans/{{message.data}}/bills
\ No newline at end of file
diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/request/verify/account/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/request/verify/account/message.hbs
index fafafde4..f55093a4 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/sms/request/verify/account/message.hbs
+++ b/bubble-server/src/main/resources/message_templates/en_US/sms/request/verify/account/message.hbs
@@ -1,2 +1,2 @@
-{{network.networkDomain}}: {{#string_compare contact.uuid '==' message.contact}}SMS Phone added: {{contact.info}}
-To approve: {{publicUri}}/me/action?approve={{confirmationToken}}{{else}}{{#if message.requestContact.isEmail}}Email added: {{message.requestContact.info}}{{else}}Auth added: {{message.requestContact.type}}{{/if}}{{/string_compare}}
\ No newline at end of file
+{{#string_compare contact.uuid '==' message.contact}}SMS Phone added on {{network.nickname}}: {{contact.info}}
+To approve: {{publicUri}}/me/action?approve={{confirmationToken}}{{else}}{{#if message.requestContact.isEmail}}Email added on {{network.nickname}}: {{message.requestContact.info}}{{else}}Auth added: {{message.requestContact.type}}{{/if}}{{/string_compare}}
\ No newline at end of file