diff --git a/Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs b/Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs
index 26a1fa3a3..ecbc66380 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs
@@ -701,7 +701,7 @@ namespace Barotrauma
 
                 var tempBuffer = new ReadWriteMessage();
                 WriteStatus(tempBuffer);
-                if (msgLengthBeforeStatus + tempBuffer.LengthBytes >= 255 && restrictMessageSize)
+                if (msgLengthBeforeStatus + tempBuffer.LengthBytes >= 255 && restrictMessageSize && GameMain.Lua.networking.restrictMessageSize)
                 { 
                     msg.Write(false);
                     if (msgLengthBeforeStatus < 255)
diff --git a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
index c1e0dd197..1079e0506 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
@@ -1798,6 +1798,8 @@ namespace Barotrauma.Networking
             outmsg.Write((byte)ServerNetObject.CLIENT_LIST);
             outmsg.Write(LastClientListUpdateID);
 
+            GameMain.Lua.hook.Call("writeClientList", c, outmsg);
+
             outmsg.Write((byte)connectedClients.Count);
             foreach (Client client in connectedClients)
             {
diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultLib.lua b/Barotrauma/BarotraumaShared/Lua/DefaultLib.lua
index fa535a304..9f7195fad 100644
--- a/Barotrauma/BarotraumaShared/Lua/DefaultLib.lua
+++ b/Barotrauma/BarotraumaShared/Lua/DefaultLib.lua
@@ -85,6 +85,7 @@ defaultLib["TextManager"] = CreateStatic("Barotrauma.TextManager")
 defaultLib["NetEntityEvent"] = CreateStatic("Barotrauma.Networking.NetEntityEvent")
 defaultLib["Screen"] = CreateStatic("Barotrauma.Screen")
 defaultLib["AttackResult"] = CreateStatic("Barotrauma.AttackResult", true)
+defaultLib["TempClient"] = CreateStatic("Networking.TempClient", true)
 
 defaultLib["AIObjective"] = CreateStatic("Barotrauma.AIObjective", true)
 defaultLib["AIObjectiveChargeBatteries"] = CreateStatic("Barotrauma.AIObjectiveChargeBatteries", true)
diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua
index ad341637d..0fa9fab1e 100644
--- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua
+++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua
@@ -45,7 +45,9 @@ RegisterBarotrauma("CharacterInventory")
 
 RegisterBarotrauma("Item")
 RegisterBarotrauma("Submarine")
+RegisterBarotrauma("INetSerializableStruct")
 RegisterBarotrauma("Networking.Client")
+RegisterBarotrauma("Networking.TempClient")
 RegisterBarotrauma("Networking.NetworkConnection")
 RegisterBarotrauma("Networking.LidgrenConnection")
 RegisterBarotrauma("Networking.SteamP2PConnection")