diff --git a/src/server/server.c b/src/server/server.c
index 1faa6fe914e2ddb26653479209c27411d61d6e57..66d10627290d1a9d3a82b1b46a3f6d0fa7fffe59 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -682,6 +682,13 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 			return ;
 		}
 	}
+
+	// Disabled accounts
+	if( userFlags & USER_FLAG_DISABLED ) {
+		Client->UID = -1;
+		sendf(Client->Socket, "403 Account disabled\n");
+		return ;
+	}
 	
 	sendf(Client->Socket, "200 User set\n");
 }