diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp
index 0da1d13e5f..af8d06fb5d 100644
--- a/src/openrct2/config/Config.cpp
+++ b/src/openrct2/config/Config.cpp
@@ -357,6 +357,10 @@ namespace Config
                 }
             }
 
+            // Trim any whitespace before or after the player's name,
+            // to avoid people pretending to be someone else
+            playerName = String::Trim(playerName);
+
             auto model = &gConfigNetwork;
             model->player_name = playerName;
             model->default_port = reader->GetSint32("default_port", NETWORK_DEFAULT_PORT);
diff --git a/src/openrct2/network/network.cpp b/src/openrct2/network/network.cpp
index d1e351d0b1..97647b2f07 100644
--- a/src/openrct2/network/network.cpp
+++ b/src/openrct2/network/network.cpp
@@ -1478,7 +1478,7 @@ NetworkPlayer* Network::AddPlayer(const utf8 *name, const std::string &keyhash)
             if (networkUser == nullptr) {
                 player->Group = GetDefaultGroup();
                 if (!String::IsNullOrEmpty(name)) {
-                    player->SetName(MakePlayerNameUnique(std::string(name)));
+                    player->SetName(MakePlayerNameUnique(String::Trim(std::string(name))));
                 }
             } else {
                 player->Group = networkUser->GroupId.GetValueOrDefault(GetDefaultGroup());
@@ -1488,7 +1488,7 @@ NetworkPlayer* Network::AddPlayer(const utf8 *name, const std::string &keyhash)
             player = std::unique_ptr<NetworkPlayer>(new NetworkPlayer); // change to make_unique in c++14
             player->Id = newid;
             player->Group = GetDefaultGroup();
-            player->SetName(name);
+            player->SetName(String::Trim(std::string(name)));
         }
 
         addedplayer = player.get();
diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h
index 6565db4acf..c66a5581d6 100644
--- a/src/openrct2/network/network.h
+++ b/src/openrct2/network/network.h
@@ -55,7 +55,7 @@ extern "C" {
 // This define specifies which version of network stream current build uses.
 // It is used for making sure only compatible builds get connected, even within
 // single OpenRCT2 version.
-#define NETWORK_STREAM_VERSION "4"
+#define NETWORK_STREAM_VERSION "5"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 #ifdef __cplusplus