diff --git a/CHANGELOG.md b/CHANGELOG.md
index d670a3ab..0b2cbe30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,10 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * Environment setting script is much more user friendly and does not require an excessive amount of clicking and typing.
 * File upload method switched from BinaryJS to Socket.io implementation to fix bugs as well as be a little speedier and allow upload throttling.
 * `Server::getbyUUID()` now accepts either the `uuidShort` or full-length `uuid` for server identification.
+* API keys are tied to individual users and no longer created through the Admin CP.
+
+### Fixed
+* Server overview listing the location short-code as the name of the node.
 
 ## v0.5.0-pre.2 (Bodacious Boreopterus)
 
diff --git a/resources/views/base/index.blade.php b/resources/views/base/index.blade.php
index eaf1a661..43392975 100644
--- a/resources/views/base/index.blade.php
+++ b/resources/views/base/index.blade.php
@@ -58,7 +58,7 @@
                             </td>
                         @endif
                         <td><a href="/server/{{ $server->uuidShort }}">{{ $server->name }}</a></td>
-                        <td><code>{{ $server->a_locationShort }}</code></td>
+                        <td>{{ $server->nodeName }}</td>
                         <td><code>@if(!is_null($server->ip_alias)){{ $server->ip_alias }}@else{{ $server->ip }}@endif:{{ $server->port }}</code></td>
                         <td class="text-center" data-action="players">--</td>
                         <td class="text-center hidden-sm hidden-xs"><span data-action="memory">--</span> / {{ $server->memory === 0 ? '&infin;' : $server->memory }} MB</td>