1 files changed, 8 insertions, 3 deletions
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 71840a22a..57f81a044 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -1093,11 +1093,16 @@ void ShowRULES(userrec *user)
 // registration timeout maximum seconds)
 bool AllModulesReportReady(userrec* user)
 {
+	if (!Config->global_implementation[I_OnCheckReady])
+		return true;
         for (int i = 0; i <= MODCOUNT; i++)
         {
-                int res = modules[i]->OnCheckReady(user);
-                if (!res)
-                        return false;
+		if (Config->implement_lists[i][I_OnCheckReady])
+		{
+			int res = modules[i]->OnCheckReady(user);
+			if (!res)
+	                        return false;
+		}
         }
         return true;
 }