diff --git a/src/network.zig b/src/network.zig
index ec2ce8858..3ae33aa11 100644
--- a/src/network.zig
+++ b/src/network.zig
@@ -637,7 +637,7 @@ pub const Protocols = struct {
 		const stepUserData: u8 = 1;
 		const stepAssets: u8 = 2;
 		const stepServerData: u8 = 3;
-		const stepComplete: u8 = 255;
+		pub const stepComplete: u8 = 255;
 
 		fn receive(conn: *Connection, data: []const u8) !void {
 			if(conn.handShakeState.load(.monotonic) < data[0]) {
@@ -678,7 +678,6 @@ pub const Protocols = struct {
 						conn.flush();
 						conn.mutex.unlock();
 						conn.handShakeState.store(stepServerData, .monotonic);
-						conn.handShakeState.store(stepComplete, .monotonic);
 						main.server.connect(conn.user.?);
 					},
 					stepAssets => {
diff --git a/src/server/server.zig b/src/server/server.zig
index 35fef900e..dfb3c3c2d 100644
--- a/src/server/server.zig
+++ b/src/server/server.zig
@@ -471,6 +471,7 @@ pub fn connectInternal(user: *User) void {
 	userMutex.lock();
 	users.append(user);
 	userMutex.unlock();
+	user.conn.handShakeState.store(main.network.Protocols.handShake.stepComplete, .monotonic);
 }
 
 pub fn messageFrom(msg: []const u8, source: *User) void { // MARK: message