diff --git a/CHANGELOG.md b/CHANGELOG.md
index d39224312..f5035d638 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * Team Fortress named 'Insurgency' in panel in database seeder. ([#96](https://github.com/Pterodactyl/Panel/issues/96), PR by [@MeltedLux](https://github.com/MeltedLux))
 * Server allocation listing display now showing the connection IP unless an alias was assigned.
 * Fixed bug where node allocation would appear to be successful but actual encounter an error. Made it cleared how to enter ports.
+* Fixes display where an extra space was added to the end of SFTP passwords when they were copied from the panel. [#116](https://github.com/Pterodactyl/Panel/issues/116), thanks [@OrangeJuiced](https://github.com/OrangeJuiced)
 
 ### Deprecated
 ### Removed
diff --git a/resources/views/server/settings.blade.php b/resources/views/server/settings.blade.php
index 3d2442818..4acead9e8 100644
--- a/resources/views/server/settings.blade.php
+++ b/resources/views/server/settings.blade.php
@@ -74,7 +74,7 @@
                                 @can('view-sftp-password', $server)
                                     <label class="control-label">Current Password:</label>
                                     <div>
-                                        <input type="text" readonly="readonly" class="form-control" value="@if(!is_null($server->sftp_password)){{ Crypt::decrypt($server->sftp_password) }} @endif" />
+                                        <input type="text" readonly="readonly" class="form-control" value="@if(!is_null($server->sftp_password)){{ Crypt::decrypt($server->sftp_password) }}@endif" />
                                     </div>
                                 @endcan
                                 </div>