diff --git a/server/index.js b/server/index.js
index 422d4c39..5f3c2516 100755
--- a/server/index.js
+++ b/server/index.js
@@ -102,7 +102,6 @@ server.listen(port, function () {
 	console.log('Server listening at port %d', port);
 });
 
-
 app.get('/robots.txt', function (req, res) {
 	res.type('text/plain');
 	res.send("User-agent: *\nAllow: /$\nDisallow: /");
@@ -114,6 +113,8 @@ app.use(function (req, res, next) {
 		var user_name = Functions.rndName(uniqid.time(), 15);
 		res.cookie('_uI',user_name, { maxAge: 365 * 10000 * 3600000 });
 	}
+	res.header("Access-Control-Allow-Origin", "*");
+    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
 	next();
 });
 
diff --git a/server/routing/router.js b/server/routing/router.js
index 0c951502..db8a8ce8 100644
--- a/server/routing/router.js
+++ b/server/routing/router.js
@@ -47,9 +47,6 @@ router.route('/:channel_name').get(function(req, res, next){
 });
 
 router.route('/api/frontpages').get(function(req, res) {
-    res.header("Access-Control-Allow-Origin", "*");
-    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-
     db.collection("frontpage_lists").find({frontpage: true, count: {$gt: 0}}, function(err, docs) {
         db.collection("connected_users").find({"_id": "total_users"}, function(err, tot) {
             res.setHeader('Content-Type', 'application/json');
@@ -75,9 +72,6 @@ router.route('/api/list/:channel_name').get(function(req, res) {
 });
 
 router.route('/api/conf/:channel_name').get(function(req, res) {
-    res.header("Access-Control-Allow-Origin", "*");
-    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-
     var channel_name = req.params.channel_name;
     db.collection(channel_name).find({views: {$exists: true}},
         {
@@ -116,9 +110,6 @@ router.route('/api/conf/:channel_name').get(function(req, res) {
 });
 
 router.route('/api/imageblob').post(function(req, res) {
-    res.header("Access-Control-Allow-Origin", "*");
-    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-
     var Jimp = require("jimp");
     Jimp.read('https://img.youtube.com/vi/' + req.body.id + '/mqdefault.jpg', function (err, image) {
         if (err) console.log(err);