diff --git a/public/templates/artists/profile.html b/public/templates/artists/profile.html
index 6b2db13c..21012f0d 100644
--- a/public/templates/artists/profile.html
+++ b/public/templates/artists/profile.html
@@ -10,7 +10,7 @@
         <div ng-show="::artist.is_archived">
             <h2>Archived profile</h2>
             <p>This is an archived artist profile that&#39;s part of a music archive. If it&#39;s yours, email
-                <a href="mailto:logic@pony.fm" target="_blank">logic@pony.fm</a> to claim it!</p>
+                <a href="mailto:support@pony.fm" target="_blank">Pony.fm Support</a> to claim it!</p>
         </div>
 
         <pfm-comments type="user" resource="::artist"></pfm-comments>
diff --git a/public/templates/pages/about.html b/public/templates/pages/about.html
index 29884326..48b6662d 100644
--- a/public/templates/pages/about.html
+++ b/public/templates/pages/about.html
@@ -19,5 +19,5 @@
 
     <h2>Who is behind Pony.fm?</h2>
     <p>Pony.fm was created by Feld0, a pony-loving teenager who heard the call of code. Recognizing the need for a true pony-specific music hosting site, and realizing that MLP Forums provided him with the resources he needed to make it happen, he created a blank text file and started pumping code into his computer.</p>
-<p>The site is now maintained by him, Nelson LaQuet and Logic as part of the <a href="https://poniverse.net/" target="_blank">Poniverse</a> network.</p>
+    <p>The site is now maintained by the <a href="https://poniverse.net/" target="_blank">Poniverse</a> network.</p>
 </div>
diff --git a/public/templates/pages/faq.html b/public/templates/pages/faq.html
index 27adf331..82695379 100644
--- a/public/templates/pages/faq.html
+++ b/public/templates/pages/faq.html
@@ -21,7 +21,7 @@
         individually whitelisted.</p>
 
     <p>Most of these should have been nailed by now, but if yours isn't being
-        accepted, contact <a href="mailto:mercury@poniverse.net" target="_blank">mercury@poniverse.net/a>
+        accepted, contact <a href="mailto:mercury@poniverse.net" target="_blank">mercury@poniverse.net/a> or <a href="mailto:support@pony.fm" target="_blank">Pony.fm Support</a>
         with
         a
         copy of the file you&#39;re trying to upload and we&#39;ll sort it out!
@@ -70,7 +70,7 @@
             Pony.fm forum</a>.
         </li>
         <li>Email <a href="mailto:mercury@poniverse.net"
-                     target="_blank">Mercury</a>, Pony.fm&#39;s current Project Manager.
+                     target="_blank">Mercury</a>, Pony.fm&#39;s current Project Manager, or <a href="mailto:support@pony.fm" target="_blank">Pony.fm Support</a>.
         </li>
         <li>Open a <a href="https://github.com/Poniverse/Pony.fm/issues"
                       target="_blank">GitHub issue</a>.
diff --git a/public/templates/partials/track-load-fail-dialog.html b/public/templates/partials/track-load-fail-dialog.html
index 35b81f13..4347539c 100644
--- a/public/templates/partials/track-load-fail-dialog.html
+++ b/public/templates/partials/track-load-fail-dialog.html
@@ -7,7 +7,7 @@
             </div>
             <div class="modal-body">
                 <p>This track is not available. It may still be processing. Please check back in a few minutes.</p>
-                <p>If you're still getting this error after 30 minutes, please email <a href="mailto:logic@pony.fm">logic@pony.fm</a></p>
+                <p>If you're still getting this error after 30 minutes, please email <a href="mailto:support@pony.fm" target="_blank">Pony.fm Support</a></p>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-primary" ng-click="$hide()">Ok</button>
diff --git a/public/templates/uploader/index.html b/public/templates/uploader/index.html
index 5796c7a8..23252858 100644
--- a/public/templates/uploader/index.html
+++ b/public/templates/uploader/index.html
@@ -13,7 +13,7 @@
 
     <p>Note that you&#39;ll need to publish your tracks after uploading them before they&#39;ll become available to the public.</p>
 
-    <p>Contact <a href="mailto:logic@pony.fm">logic@pony.fm</a> if you run into any issues!</p>
+    <p>Contact <a href="mailto:support@pony.fm" target="_blank">Pony.fm Support</a> if you run into any issues!</p>
 
     <ul class="uploads">
         <li ng-repeat="upload in data.queue track by $index" ng-class="{'uploading': upload.isUploading, 'has-error': upload.error != null, 'is-processing': upload.isProcessing || (upload.progress >= 100 && upload.error == null)}" ng-animate="'upload-queue'">