diff --git a/src/services/juxt-web/routes/ctr/posts.js b/src/services/juxt-web/routes/ctr/posts.js
index eaf7a00..4b91021 100644
--- a/src/services/juxt-web/routes/ctr/posts.js
+++ b/src/services/juxt-web/routes/ctr/posts.js
@@ -12,16 +12,20 @@ router.post('/empathy', function (req, res) {
     database.connect().then(async e => {
         let pid = util.data.processServiceToken(req.headers["x-nintendo-servicetoken"]);
         let post = await database.getPostByID(req.body.postID);
-        if(pid === null)
-            pid = 1000000000;
         let user = await database.getUserByPID(pid);
-        if(req.body.type === 'up' && user !== null && user.likes.indexOf(post.id) === -1 && user.id !== post.pid)
+
+        if(user.pid === 1000000000) {
+            res.sendStatus(403);
+            return;
+        }
+
+        if(req.body.type === 'up' && user.likes.indexOf(post.id) === -1 && user.id !== post.pid)
         {
             post.upEmpathy();
             user.addToLikes(post.id)
             res.sendStatus(200);
         }
-        else if(req.body.type === 'down' && user !== null  && user.likes.indexOf(post.id) !== -1 && user.id !== post.pid)
+        else if(req.body.type === 'down' && user.likes.indexOf(post.id) !== -1 && user.id !== post.pid)
         {
             post.downEmpathy();
             user.removeFromLike(post.id);
diff --git a/src/services/juxt-web/routes/portal/posts.js b/src/services/juxt-web/routes/portal/posts.js
index eaf7a00..502c0c1 100644
--- a/src/services/juxt-web/routes/portal/posts.js
+++ b/src/services/juxt-web/routes/portal/posts.js
@@ -12,16 +12,18 @@ router.post('/empathy', function (req, res) {
     database.connect().then(async e => {
         let pid = util.data.processServiceToken(req.headers["x-nintendo-servicetoken"]);
         let post = await database.getPostByID(req.body.postID);
-        if(pid === null)
-            pid = 1000000000;
+        if(pid === null) {
+            res.sendStatus(403);
+            return;
+        }
         let user = await database.getUserByPID(pid);
-        if(req.body.type === 'up' && user !== null && user.likes.indexOf(post.id) === -1 && user.id !== post.pid)
+        if(req.body.type === 'up' && user.likes.indexOf(post.id) === -1 && user.id !== post.pid)
         {
             post.upEmpathy();
             user.addToLikes(post.id)
             res.sendStatus(200);
         }
-        else if(req.body.type === 'down' && user !== null  && user.likes.indexOf(post.id) !== -1 && user.id !== post.pid)
+        else if(req.body.type === 'down' && user.likes.indexOf(post.id) !== -1 && user.id !== post.pid)
         {
             post.downEmpathy();
             user.removeFromLike(post.id);
diff --git a/src/services/juxt-web/routes/portal/show.js b/src/services/juxt-web/routes/portal/show.js
index a902659..07abb32 100644
--- a/src/services/juxt-web/routes/portal/show.js
+++ b/src/services/juxt-web/routes/portal/show.js
@@ -6,7 +6,7 @@ var moment = require('moment');
 var router = express.Router();
 
 router.get('/', function (req, res) {
-    res.header('X-Nintendo-WhiteList','1|http,youtube.com,,2|https,youtube.com,,2|http,.youtube.com,,2|https,.youtube.com,,2|http,.ytimg.com,,2|https,.ytimg.com,,2|http,.googlevideo.com,,2|https,.googlevideo.com,,2|https,youtube.com,/embed/,6|https,youtube.com,/e/,6|https,youtube.com,/v/,6|https,www.youtube.com,/embed/,6|https,www.youtube.com,/e/,6|https,www.youtube.com,/v/,6|https,youtube.googleapis.com,/e/,6|https,youtube.googleapis.com,/v/,6|http,maps.googleapis.com,/maps/api/streetview,2|https,maps.googleapis.com,/maps/api/streetview,2|http,cbk0.google.com,/cbk,2|https,cbk0.google.com,/cbk,2|http,cbk1.google.com,/cbk,2|https,cbk1.google.com,/cbk,2|http,cbk2.google.com,/cbk,2|https,cbk2.google.com,/cbk,2|http,cbk3.google.com,/cbk,2|https,cbk3.google.com,/cbk,2|https,.cloudfront.net,,2|https,www.google-analytics.com,/,2|https,stats.g.doubleclick.net,,2|https,www.google.com,/ads/,2|https,ssl.google-analytics.com,,2|http,fonts.googleapis.com,,2|fonts.googleapis.com,,2|https,www.googletagmanager.com,,2');
+    res.header('X-Nintendo-WhiteList','1|http,youtube.com,,2|https,youtube.com,,2|http,.youtube.com,,2|https,.youtube.com,,2|http,.ytimg.com,,2|https,.ytimg.com,,2|http,.googlevideo.com,,2|https,.googlevideo.com,,2|https,youtube.com,/embed/,6|https,youtube.com,/e/,6|https,youtube.com,/v/,6|https,www.youtube.com,/embed/,6|https,www.youtube.com,/e/,6|https,www.youtube.com,/v/,6|https,youtube.googleapis.com,/e/,6|https,youtube.googleapis.com,/v/,6|http,maps.googleapis.com,/maps/api/streetview,2|https,maps.googleapis.com,/maps/api/streetview,2|http,cbk0.google.com,/cbk,2|https,cbk0.google.com,/cbk,2|http,cbk1.google.com,/cbk,2|https,cbk1.google.com,/cbk,2|http,cbk2.google.com,/cbk,2|https,cbk2.google.com,/cbk,2|http,cbk3.google.com,/cbk,2|https,cbk3.google.com,/cbk,2|https,.cloudfront.net,,2|https,www.google-analytics.com,/,2|https,stats.g.doubleclick.net,,2|https,www.google.com,/ads/,2|https,ssl.google-analytics.com,,2|http,fonts.googleapis.com,,2|fonts.googleapis.com,,2|https,www.googletagmanager.com,,2|http,miiverse.cc,,2|https,miiverse.cc,,2');
     database.connect().then(async e => {
         let pid = util.data.processServiceToken(req.headers["x-nintendo-servicetoken"]);
         let user = null;
@@ -67,7 +67,7 @@ router.get('/', function (req, res) {
 });
 
 router.get('/first', function (req, res) {
-    res.header('X-Nintendo-WhiteList','1|http,youtube.com,,2|https,youtube.com,,2|http,.youtube.com,,2|https,.youtube.com,,2|http,.ytimg.com,,2|https,.ytimg.com,,2|http,.googlevideo.com,,2|https,.googlevideo.com,,2|https,youtube.com,/embed/,6|https,youtube.com,/e/,6|https,youtube.com,/v/,6|https,www.youtube.com,/embed/,6|https,www.youtube.com,/e/,6|https,www.youtube.com,/v/,6|https,youtube.googleapis.com,/e/,6|https,youtube.googleapis.com,/v/,6|http,maps.googleapis.com,/maps/api/streetview,2|https,maps.googleapis.com,/maps/api/streetview,2|http,cbk0.google.com,/cbk,2|https,cbk0.google.com,/cbk,2|http,cbk1.google.com,/cbk,2|https,cbk1.google.com,/cbk,2|http,cbk2.google.com,/cbk,2|https,cbk2.google.com,/cbk,2|http,cbk3.google.com,/cbk,2|https,cbk3.google.com,/cbk,2|https,.cloudfront.net,,2|https,www.google-analytics.com,/,2|https,stats.g.doubleclick.net,,2|https,www.google.com,/ads/,2|https,ssl.google-analytics.com,,2|http,fonts.googleapis.com,,2|fonts.googleapis.com,,2|https,www.googletagmanager.com,,2');
+    res.header('X-Nintendo-WhiteList','1|http,youtube.com,,2|https,youtube.com,,2|http,.youtube.com,,2|https,.youtube.com,,2|http,.ytimg.com,,2|https,.ytimg.com,,2|http,.googlevideo.com,,2|https,.googlevideo.com,,2|https,youtube.com,/embed/,6|https,youtube.com,/e/,6|https,youtube.com,/v/,6|https,www.youtube.com,/embed/,6|https,www.youtube.com,/e/,6|https,www.youtube.com,/v/,6|https,youtube.googleapis.com,/e/,6|https,youtube.googleapis.com,/v/,6|http,maps.googleapis.com,/maps/api/streetview,2|https,maps.googleapis.com,/maps/api/streetview,2|http,cbk0.google.com,/cbk,2|https,cbk0.google.com,/cbk,2|http,cbk1.google.com,/cbk,2|https,cbk1.google.com,/cbk,2|http,cbk2.google.com,/cbk,2|https,cbk2.google.com,/cbk,2|http,cbk3.google.com,/cbk,2|https,cbk3.google.com,/cbk,2|https,.cloudfront.net,,2|https,www.google-analytics.com,/,2|https,stats.g.doubleclick.net,,2|https,www.google.com,/ads/,2|https,ssl.google-analytics.com,,2|http,fonts.googleapis.com,,2|fonts.googleapis.com,,2|https,www.googletagmanager.com,,2|http,pretendo.cc,,2|https,pretendo.cc,,2');
     res.render('portal/first_run.ejs', {});
 });
 
diff --git a/src/services/juxt-web/routes/portal/userpage.js b/src/services/juxt-web/routes/portal/userpage.js
index 57c661f..9995ef2 100644
--- a/src/services/juxt-web/routes/portal/userpage.js
+++ b/src/services/juxt-web/routes/portal/userpage.js
@@ -2,13 +2,14 @@ var express = require('express');
 var xml = require('object-to-xml');
 const database = require('../../../../database');
 const util = require('../../../../authentication');
+const config = require('../../../../config.json');
 var multer  = require('multer');
 var moment = require('moment');
 var upload = multer({ dest: 'uploads/' });
 var router = express.Router();
 
 router.get('/me', function (req, res) {
-    res.header('X-Nintendo-WhiteList','1|http,youtube.com,,2|https,youtube.com,,2|http,.youtube.com,,2|https,.youtube.com,,2|http,.ytimg.com,,2|https,.ytimg.com,,2|http,.googlevideo.com,,2|https,.googlevideo.com,,2|https,youtube.com,/embed/,6|https,youtube.com,/e/,6|https,youtube.com,/v/,6|https,www.youtube.com,/embed/,6|https,www.youtube.com,/e/,6|https,www.youtube.com,/v/,6|https,youtube.googleapis.com,/e/,6|https,youtube.googleapis.com,/v/,6|http,maps.googleapis.com,/maps/api/streetview,2|https,maps.googleapis.com,/maps/api/streetview,2|http,cbk0.google.com,/cbk,2|https,cbk0.google.com,/cbk,2|http,cbk1.google.com,/cbk,2|https,cbk1.google.com,/cbk,2|http,cbk2.google.com,/cbk,2|https,cbk2.google.com,/cbk,2|http,cbk3.google.com,/cbk,2|https,cbk3.google.com,/cbk,2|https,.cloudfront.net,,2|https,www.google-analytics.com,/,2|https,stats.g.doubleclick.net,,2|https,www.google.com,/ads/,2|https,ssl.google-analytics.com,,2|http,fonts.googleapis.com,,2||fonts.googleapis.com,,2');
+    res.header('X-Nintendo-WhiteList','1|http,youtube.com,,2|https,youtube.com,,2|http,pretendo.cc,,2|https,pretendo.cc,,2');
     var isAJAX = ((req.query.ajax+'').toLowerCase() === 'true')
     database.connect().then(async e => {
 
@@ -27,7 +28,8 @@ router.get('/me', function (req, res) {
                 moment: moment,
                 user: user,
                 newPosts: newPosts,
-                numPosts: numPosts
+                numPosts: numPosts,
+                account_server: config.account_server_domain.slice(8),
             });
         }
         else {
@@ -37,7 +39,8 @@ router.get('/me', function (req, res) {
                 moment: moment,
                 user: user,
                 newPosts: newPosts,
-                numPosts: numPosts
+                numPosts: numPosts,
+                account_server: config.account_server_domain.slice(8),
             });
         }
 
@@ -121,7 +124,8 @@ router.get('/show', function (req, res) {
             user: user,
             newPosts: newPosts,
             numPosts: numPosts,
-            parentUser: parentUser
+            parentUser: parentUser,
+            account_server: config.account_server_domain.slice(8),
         });
     }).catch(error => {
         console.error(error);
@@ -157,6 +161,7 @@ router.get('/loadPosts', function (req, res) {
                 moment: moment,
                 user: user,
                 newPosts: newPosts,
+                account_server: config.account_server_domain.slice(8),
             });
         }
         else
diff --git a/src/webfiles/portal/js/juxt.js b/src/webfiles/portal/js/juxt.js
index 58f8f2d..18ef48f 100644
--- a/src/webfiles/portal/js/juxt.js
+++ b/src/webfiles/portal/js/juxt.js
@@ -181,9 +181,11 @@ function yeah(postNode, postID) {
         xhr.open("POST", '/posts/empathy', true);
         xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
         xhr.send(params);
+        if(yeahcount > 0) {
+            yeahCountElement.innerHTML = --yeahcount + ' Yeahs';
+            wiiuSound.playSoundByName('SE_OLV_MII_CANCEL', 1);
+        }
 
-        yeahCountElement.innerHTML = --yeahcount + ' Yeahs';
-        wiiuSound.playSoundByName('SE_OLV_MII_CANCEL', 1);
     }
     else {
         postNode.classList.add("selected");
@@ -203,8 +205,6 @@ function yeah(postNode, postID) {
                 wiiuSound.playSoundByName('SE_WAVE_MII_ADD', 1);
             }
         }
-
-
         xhttp.send(params);
 
 
diff --git a/src/webfiles/portal/me_page.ejs b/src/webfiles/portal/me_page.ejs
index 459e799..5b74cbd 100644
--- a/src/webfiles/portal/me_page.ejs
+++ b/src/webfiles/portal/me_page.ejs
@@ -98,7 +98,7 @@
         <div class="user-page-follow-button-wrapper" <%if(user.pid === 1000000000 || user.account_status !== 0) {%> style="display: none" <%}%>>
             <p class="user-page-follow-button-text" onclick="showOverlay()">User Settings</p>
         </div>
-        <img class="community-page-info-icon" src="<%= user.pfp_uri %>">
+        <img class="community-page-info-icon" src="http://mii-images.cdn.<%= account_server %>/<%= user.pid %>/normal_face.png">
         <h2 class="community-page-title"><%= user.user_id %></h2>
         <h4 class="community-page-description"><%if(user.profile_comment_visibility){%> <%= user.profile_comment %> <%}else {%>Private<%}%></h4>
         <div class="community-page-margin-line"></div>