diff --git a/server/README.md b/server/README.md
index 3712bdb1..c3057e69 100644
--- a/server/README.md
+++ b/server/README.md
@@ -1,3 +1,7 @@
+## Apps
+
+Under ``` /server/apps/ ```, there are two files, ``` admin.js ``` and ``` client.js ```.``` admin.js ``` are for the adminpanel, and ``` client.js ``` are for zoff itself.
+
 ## Events
 
 ### To server
diff --git a/server/handlers/notifications.js b/server/handlers/notifications.js
index fa4b137e..ea1b673f 100644
--- a/server/handlers/notifications.js
+++ b/server/handlers/notifications.js
@@ -14,8 +14,8 @@ function requested_change(type, string, channel) {
                 var message = "A " + type + " change was requested on <b>" + channel + "</b><br><br>New supposed value is: <br><br><b>" + string + "</b><br><br><br> \
                 Go to <a href='https://admin.zoff.me/'>https://admin.zoff.me/</a> to accept or decline the request.";
                 var msg = {
-                    from: 'no-reply@zoff.no',
-                    to: 'kasper@zoff.no',
+                    from: 'no-reply@zoff.me',
+                    to: 'kasper@zoff.me',
                     subject: 'ZOFF: Requested new ' + type,
                     text: message,
                     html: message,
diff --git a/server/public/assets/html/offline.html b/server/public/assets/html/offline.html
index 853483fa..26eda61c 100755
--- a/server/public/assets/html/offline.html
+++ b/server/public/assets/html/offline.html
@@ -27,7 +27,7 @@
                     We're sorry, but Zoff doesn't seem to be working at the moment. Have you checked your internet connection lately?
                 </p>
                 <p>
-                    <a href="mailto:contact@zoff.no?Subject=Zoff%20is%20Down" style="color:darkgrey;text-decoration:none;">Contact Us</a>
+                    <a href="mailto:contact@zoff.me?Subject=Zoff%20is%20Down" style="color:darkgrey;text-decoration:none;">Contact Us</a>
                 </p>
             </div>
         </div>
diff --git a/server/public/assets/js/helpers.js b/server/public/assets/js/helpers.js
index f709b646..9eb7c02e 100755
--- a/server/public/assets/js/helpers.js
+++ b/server/public/assets/js/helpers.js
@@ -254,7 +254,7 @@ var Helper = {
                         $("#contact-container").html("Mail has been sent, we'll be back with you shortly.")
                     }else{
                         $("#contact-container").empty();
-                        $("#contact-container").html("Something went wrong, sorry about that. You could instead try with your own mail-client: <a title='Open in client' href='mailto:contact@zoff.no?Subject=Contact%20Zoff'>contact@zoff.no</a>")
+                        $("#contact-container").html("Something went wrong, sorry about that. You could instead try with your own mail-client: <a title='Open in client' href='mailto:contact@zoff.me?Subject=Contact%20Zoff'>contact@zoff.me</a>")
                     }
                 }
             });
diff --git a/server/routing/client/api.js b/server/routing/client/api.js
index 25440ae0..8659788e 100644
--- a/server/routing/client/api.js
+++ b/server/routing/client/api.js
@@ -113,8 +113,8 @@ try {
                     var from = req.body.from;
                     var message = req.body.message;
                     var msg = {
-                        from: 'no-reply@zoff.no',
-                        to: 'contact@zoff.no',
+                        from: 'no-reply@zoff.me',
+                        to: 'contact@zoff.me',
                         subject: 'ZOFF: Contact form webpage',
                         text: message,
                         html: message,