diff --git a/server/apps/client.js b/server/apps/client.js
index 1f8f75d6..052815dd 100755
--- a/server/apps/client.js
+++ b/server/apps/client.js
@@ -73,27 +73,39 @@ app.get('/robots.txt', function (req, res) {
 
 app.use(function (req, res, next) {
 	var cookie = req.cookies._uI;
-	if (cookie === undefined) {
-		console.error((new Date), "couldn't fetch cookie for some reason, maybe no cookie exists?", req, "couldn't fetch cookie for some reason, maybe no cookie exists?");
-		var user_name = Functions.hash_pass(Functions.rndName(uniqid.time(), 15));
-		res.cookie('_uI', user_name, {
-            maxAge: 365 * 10000 * 3600000,
-            httpOnly: true,
-            secure: secure,
-            sameSite: true,
-        });
+	if(req.originalUrl.split("/").length > 3) {
+		res.header("Access-Control-Allow-Origin", "*");
+	    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+		next();
 	} else {
-		//process.stderr.write((new Date), "couldn't fetch cookie for some reason, maybe no cookie exists?", req, "couldn't fetch cookie for some reason, maybe no cookie exists?");
-		res.cookie('_uI', cookie, {
-            maxAge: 365 * 10000 * 3600000,
-            httpOnly: true,
-            secure: secure,
-            sameSite: true,
-        });
+		if (cookie === undefined) {
+            try {
+				console.error((new Date), "originalUrl", req.originalUrl);
+	            console.error((new Date), "couldn't fetch cookie for some reason, maybe no cookie exists?", req.get('origin'), "couldn't fetch cookie for some reason, maybe no cookie exists?");
+
+			} catch(e) {
+                console.error((new Date), "couldn't fetch origin");
+            }
+            var user_name = Functions.hash_pass(Functions.rndName(uniqid.time(), 15));
+			res.cookie('_uI', user_name, {
+	            maxAge: 365 * 10000 * 3600000,
+	            httpOnly: true,
+	            secure: secure,
+	            sameSite: true,
+	        });
+		} else {
+			//process.stderr.write((new Date), "couldn't fetch cookie for some reason, maybe no cookie exists?", req, "couldn't fetch cookie for some reason, maybe no cookie exists?");
+			res.cookie('_uI', cookie, {
+	            maxAge: 365 * 10000 * 3600000,
+	            httpOnly: true,
+	            secure: secure,
+	            sameSite: true,
+	        });
+		}
+		res.header("Access-Control-Allow-Origin", "*");
+	    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+		next();
 	}
-	res.header("Access-Control-Allow-Origin", "*");
-    res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
-	next();
 });
 
 app.use('/service-worker.js', function(req, res) {
diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css
index 4bc8716a..e87ae7b4 100755
--- a/server/public/assets/css/style.css
+++ b/server/public/assets/css/style.css
@@ -3432,10 +3432,9 @@ nav ul li:hover, nav ul li.active {
 
     .title-container{
         background-color: rgba(0,0,0,0.1);
-        display: inline-block;
+        display: block;
         top:56px !important;
         width: 100vw;
-
         background: #2d2d2d;
     }
     .title-container li {
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index 1de34e75..1fe98241 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -566,7 +566,7 @@ var Player = {
             //var elem          = document.getElementById('song-title');
             //var getTitleViews = document.getElementById('viewers');
 
-            if(!client) {
+            if(!client && !embed) {
                 document.getElementById("host-title").innerText = title;
             }
             document.getElementById("song-title").innerText = title;