diff --git a/Plan/src/main/resources/assets/plan/plan/geocodes.json b/Plan/src/main/resources/assets/plan/plan/geocodes.json
new file mode 100644
index 000000000..5f6e82985
--- /dev/null
+++ b/Plan/src/main/resources/assets/plan/plan/geocodes.json
@@ -0,0 +1,225 @@
+{
+  "belarus": "BLR",
+  "japan": "JPN",
+  "gambia, the": "GMB",
+  "south africa": "ZAF",
+  "guinea": "GIN",
+  "saint kitts and nevis": "KNA",
+  "san marino": "SMR",
+  "estonia": "EST",
+  "dominican republic": "DOM",
+  "cook islands": "COK",
+  "philippines": "PHL",
+  "cuba": "CUB",
+  "mauritius": "MUS",
+  "mali": "MLI",
+  "switzerland": "CHE",
+  "hong kong": "HKG",
+  "armenia": "ARM",
+  "vietnam": "VNM",
+  "australia": "AUS",
+  "laos": "LAO",
+  "aruba": "ABW",
+  "solomon islands": "SLB",
+  "turkey": "TUR",
+  "ukraine": "UKR",
+  "austria": "AUT",
+  "united states": "USA",
+  "cambodia": "KHM",
+  "monaco": "MCO",
+  "hungary": "HUN",
+  "kenya": "KEN",
+  "greenland": "GRL",
+  "greece": "GRC",
+  "paraguay": "PRY",
+  "palau": "PLW",
+  "congo, republic of the": "COG",
+  "vanuatu": "VUT",
+  "cyprus": "CYP",
+  "colombia": "COL",
+  "azerbaijan": "AZE",
+  "syria": "SYR",
+  "rwanda": "RWA",
+  "libya": "LBY",
+  "burkina faso": "BFA",
+  "guernsey": "GGY",
+  "afghanistan": "AFG",
+  "norway": "NOR",
+  "kiribati": "KIR",
+  "dominica": "DMA",
+  "bulgaria": "BGR",
+  "south korea": "KOR",
+  "bahrain": "BHR",
+  "guatemala": "GTM",
+  "ghana": "GHA",
+  "somalia": "SOM",
+  "jamaica": "JAM",
+  "togo": "TGO",
+  "liechtenstein": "LIE",
+  "thailand": "THA",
+  "france": "FRA",
+  "serbia": "SRB",
+  "senegal": "SEN",
+  "zambia": "ZMB",
+  "comoros": "COM",
+  "namibia": "NAM",
+  "saint pierre and miquelon": "SPM",
+  "taiwan": "TWN",
+  "canada": "CAN",
+  "french polynesia": "PYF",
+  "bahamas, the": "BHM",
+  "honduras": "HND",
+  "virgin islands": "VGB",
+  "maldives": "MDV",
+  "chile": "CHL",
+  "oman": "OMN",
+  "timor-leste": "TLS",
+  "brazil": "BRA",
+  "guyana": "GUY",
+  "lesotho": "LSO",
+  "germany": "DEU",
+  "india": "IND",
+  "malaysia": "MYS",
+  "peru": "PER",
+  "trinidad and tobago": "TTO",
+  "northern mariana islands": "MNP",
+  "denmark": "DNK",
+  "sri lanka": "LKA",
+  "jersey": "JEY",
+  "belize": "BLZ",
+  "kuwait": "KWT",
+  "slovenia": "SVN",
+  "haiti": "HTI",
+  "zimbabwe": "ZWE",
+  "el salvador": "SLV",
+  "macedonia": "MKD",
+  "saint lucia": "LCA",
+  "bolivia": "BOL",
+  "china": "CHN",
+  "falkland islands (islas malvinas)": "FLK",
+  "antigua and barbuda": "ATG",
+  "brunei": "BRN",
+  "israel": "ISR",
+  "west bank": "WBG",
+  "bangladesh": "BGD",
+  "czechia": "CZE",
+  "ireland": "IRL",
+  "albania": "ALB",
+  "poland": "POL",
+  "united arab emirates": "ARE",
+  "botswana": "BWA",
+  "andorra": "AND",
+  "venezuela": "VEN",
+  "marshall islands": "MHL",
+  "malawi": "MWI",
+  "moldova": "MDA",
+  "russia": "RUS",
+  "sweden": "SWE",
+  "north korea": "PRK",
+  "madagascar": "MDG",
+  "turkmenistan": "TKM",
+  "iran": "IRN",
+  "iraq": "IRQ",
+  "seychelles": "SYC",
+  "indonesia": "IDN",
+  "nicaragua": "NIC",
+  "faroe islands": "FRO",
+  "puerto rico": "PRI",
+  "gibraltar": "GIB",
+  "curacao": "CUW",
+  "equatorial guinea": "GNQ",
+  "ethiopia": "ETH",
+  "ecuador": "ECU",
+  "guinea-bissau": "GNB",
+  "saudi arabia": "SAU",
+  "mauritania": "MRT",
+  "spain": "ESP",
+  "algeria": "DZA",
+  "congo, democratic republic of the": "COD",
+  "american samoa": "ASM",
+  "mozambique": "MOZ",
+  "cameroon": "CMR",
+  "portugal": "PRT",
+  "costa rica": "CRI",
+  "lithuania": "LTU",
+  "south sudan": "SSD",
+  "panama": "PAN",
+  "lebanon": "LBN",
+  "luxembourg": "LUX",
+  "mongolia": "MNG",
+  "italy": "ITA",
+  "finland": "FIN",
+  "bosnia and herzegovina": "BIH",
+  "benin": "BEN",
+  "nigeria": "NGA",
+  "sudan": "SDN",
+  "chad": "TCD",
+  "liberia": "LBR",
+  "djibouti": "DJI",
+  "tajikistan": "TJK",
+  "fiji": "FJI",
+  "isle of man": "IMN",
+  "singapore": "SGP",
+  "mexico": "MEX",
+  "samoa": "WSM",
+  "tunisia": "TUN",
+  "bhutan": "BTN",
+  "uganda": "UGA",
+  "uruguay": "URY",
+  "gabon": "GAB",
+  "british virgin islands": "VGB",
+  "niger": "NER",
+  "kyrgyzstan": "KGZ",
+  "pakistan": "PAK",
+  "cabo verde": "CPV",
+  "kosovo": "KSV",
+  "georgia": "GEO",
+  "yemen": "YEM",
+  "cayman islands": "CYM",
+  "argentina": "ARG",
+  "anguilla": "AIA",
+  "jordan": "JOR",
+  "swaziland": "SWZ",
+  "burundi": "BDI",
+  "slovakia": "SVK",
+  "belgium": "BEL",
+  "uzbekistan": "UZB",
+  "tanzania": "TZA",
+  "grenada": "GRD",
+  "netherlands": "NLD",
+  "sao tome and principe": "STP",
+  "guam": "GUM",
+  "eritrea": "ERI",
+  "croatia": "HRV",
+  "micronesia, federated states of": "FSM",
+  "niue": "NIU",
+  "nepal": "NPL",
+  "morocco": "MAR",
+  "bermuda": "BMU",
+  "saint martin": "MAF",
+  "suriname": "SUR",
+  "burma": "MMR",
+  "central african republic": "CAF",
+  "romania": "ROU",
+  "angola": "AGO",
+  "new zealand": "NZL",
+  "czech republic": "CZE",
+  "sierra leone": "SLE",
+  "latvia": "LVA",
+  "kazakhstan": "KAZ",
+  "sint maarten": "SXM",
+  "cote d\u0027ivoire": "CIV",
+  "egypt": "EGY",
+  "united kingdom": "GBR",
+  "malta": "MLT",
+  "iceland": "ISL",
+  "montenegro": "MNE",
+  "macau": "MAC",
+  "papua new guinea": "PNG",
+  "tuvalu": "TUV",
+  "qatar": "QAT",
+  "saint vincent and the grenadines": "VCT",
+  "tonga": "TON",
+  "barbados": "BRB",
+  "new caledonia": "NCL"
+}
diff --git a/Plan/src/main/resources/assets/plan/plan/web/js/player-values.js b/Plan/src/main/resources/assets/plan/plan/web/js/player-values.js
index 690641892..459daee68 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/js/player-values.js
+++ b/Plan/src/main/resources/assets/plan/plan/web/js/player-values.js
@@ -30,6 +30,7 @@ function loadPlayerOverviewValues(json, error) {
     $(element).find("#data_activity_index").text(data.activity_index);
     $(element).find("#data_activity_index_group").text(data.activity_index_group);
     $(element).find("#data_favorite_server").text(data.favorite_server);
+    $(element).find("#data_latest_join_address").text(data.latest_join_address);
     $(element).find("#data_average_ping").text(data.average_ping);
     $(element).find("#data_best_ping").text(data.best_ping);
     $(element).find("#data_worst_ping").text(data.worst_ping);
@@ -223,6 +224,8 @@ function createserverAccordionBody(i, server) {
         `<p><i class="col-teal far fa-fw fa-clock"></i> Longest Session<span class="float-end"><b>` + server.longest_session_length + `</b></span></p>` +
         `<p><i class="col-teal far fa-fw fa-clock"></i> Session Median<span class="float-end"><b>` + server.session_median + `</b></span></p>` +
         `<br>` +
+        `<p><i class="col-amber fa fa-fw fa-location-arrow"></i> Join Address<span class="float-end">` + server.join_address + `</span></p>` +
+        `<br>` +
         `<p><i class="col-red fa fa-fw fa-crosshairs"></i> Player Kills<span class="float-end"><b>` + server.player_kills + `</b></span></p>` +
         `<p><i class="col-green fa fa-fw fa-crosshairs"></i> Mob Kills<span class="float-end"><b>` + server.mob_kills + `</b></span></p>` +
         `<p><i class=" fa fa-fw fa-skull"></i> Deaths<span class="float-end"><b>` + server.deaths + `</b></span></p>` +
diff --git a/Plan/src/main/resources/assets/plan/plan/web/js/xmlhttprequests.js b/Plan/src/main/resources/assets/plan/plan/web/js/xmlhttprequests.js
index a4e1ee544..97f8c24fb 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/js/xmlhttprequests.js
+++ b/Plan/src/main/resources/assets/plan/plan/web/js/xmlhttprequests.js
@@ -110,13 +110,13 @@ function newConfiguredXHR(callback) {
                     callback(null, "Request did not reach the server. (Server offline / Adblocker?)")
                 }
             } catch (e) {
-                callback(null, e.message + " (See " + address + ")")
+                callback(null, e.message)
             }
         }
     };
     xhr.timeout = 45000;
     xhr.ontimeout = function () {
-        callback(null, "Timed out after 45 seconds. (" + address + ")")
+        callback(null, "Timed out after 45 seconds.")
     };
 
     return xhr;
diff --git a/Plan/src/main/resources/assets/plan/plan/web/player.html b/Plan/src/main/resources/assets/plan/plan/web/player.html
index 754f8137a..673200c64 100644
--- a/Plan/src/main/resources/assets/plan/plan/web/player.html
+++ b/Plan/src/main/resources/assets/plan/plan/web/player.html
@@ -184,7 +184,8 @@
                                                     id="data_activity_index_group"></span>)</span></p>
                                             <p><i class="col-green fa fa-fw fa-server"></i> Favorite Server <span
                                                     class="float-end" id="data_favorite_server"></span></p>
-                                            <p>&nbsp; </p>
+                                            <p><i class="col-amber fa fa-fw fa-location-arrow"></i> Join Address<span
+                                                    class="float-end" id="data_latest_join_address"></span></p>
                                             <hr>
                                             <p><i class="col-amber fa fa-fw fa-signal"></i> Average Ping <span
                                                     class="float-end" id="data_average_ping"></span></p>
@@ -717,9 +718,9 @@
         Highcharts.setOptions({
             lang: {noData: "No Data to Display"}, time: {timezoneOffset: ${timeZone} * 60}
         });
-        const playerName = '${playerName}';
+        const playerUUID = '${playerUUID}';
         setLoadingText('Loading player values..');
-        jsonRequest(`../v1/player?player=${encodeURIComponent(playerName)}`, function (json, error) {
+        jsonRequest(`../v1/player?player=${encodeURIComponent(playerUUID)}`, function (json, error) {
             loadPlayerOverviewValues(json, error);
             loadSessionAccordion(json, error);
             loadserverAccordion(json, error);