2 files changed, 13 insertions, 15 deletions
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 289007dfc..0942e7765 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -413,6 +413,9 @@ OnPCLoginEvent:
         #MerchantBank = 0;
     }
 
+    // Cannot login with outdated client
+    checkclientversion();
+
     // Message of the Day have priority
     MOTDHandler();
 
@@ -422,7 +425,7 @@ OnPCLoginEvent:
     // TODO: npc/commands/rate-management.txt
 
     // Main update handler
-    checkclientversion();
+    clientupdater();
 
     // Position and gameplay fixes
     HUB_Login();
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 8ed754a45..300ce1343 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -7,7 +7,7 @@
 //    Function checking the client version and reports if it is too old.
 //    This also handles all updates, and usually have priority.
 
-function	script	checkclientversion	{
+function	script	clientupdater	{
     // Skip any update for newcomers
     if (getmap() ~= "000-0*") {
         UPDATE=gettimetick(2);
@@ -282,24 +282,19 @@ function	script	checkclientversion	{
         #ADD_LVL=0;
         // TODO: Use @super debug functions and force player to join a guild. We will need the guild ID, though.
         rodex_sendmail(getcharid(0), "TMW2 Team", "Welcome to Moubootaur Legends", "Hey, thanks for believing on us! We hope to have a great time togheter. Any problem, ask for help in #world - the Discord bridge! Enjoy our game!", 20);
-        if (ClientVersion < 24) next;
-        /*
-        next;
-        mesn "Failsafe Mechanism";
-        mesc l("Ah... You must update your client first."), 1;
-        next;
-        */
     }
 
 
+    if (.@dg)
+        closeclientdialog;
+    return;
 
+}
 
-
-    if (ClientVersion >= 25) {
-        if (.@dg)
-            close;
+// Just be sure your client version is OK
+function	script	checkclientversion	{
+    if (ClientVersion >= 25)
         return;
-    }
 
     mesn "Narrator";
     mesc l("Warning."), 1;
@@ -311,7 +306,7 @@ function	script	checkclientversion	{
     next;
     if (ClientVersion >= 22) mesc l("Compatibility Support mode enabled. Client may crash AT RANDOM, beware.");
     if (ClientVersion >= 22) mesc l("Crazy stuff can happen in overall. YOU HAVE BEEN WARNED TO UPDATE YOUR CLIENT.");
-    if (ClientVersion >= 22) close;
+    if (ClientVersion >= 22) closeclientdialog;
     if (ClientVersion >= 22) return;
     mesc l("You won't be allowed to play this game until you have an updated client.");
     next;