diff --git a/User.cpp b/User.cpp
index e2a4bdbe..cc33e720 100644
--- a/User.cpp
+++ b/User.cpp
@@ -96,14 +96,6 @@ void CUser::DelClients() {
 	m_vClients.clear();
 }
 
-bool CUser::OnBoot() {
-#ifdef _MODULES
-	return GetModules().OnBoot();
-#else
-	return true;
-#endif
-}
-
 void CUser::IRCConnected(CIRCSock* pIRCSock) {
 	for (unsigned int a = 0; a < m_vClients.size(); a++) {
 		m_vClients[a]->IRCConnected(pIRCSock);
diff --git a/User.h b/User.h
index 69565188..bad94ef9 100644
--- a/User.h
+++ b/User.h
@@ -78,7 +78,6 @@ public:
 	void ClearMotdBuffer() { m_MotdBuffer.Clear(); }
 	void ClearQueryBuffer() { m_QueryBuffer.Clear(); }
 	// !Buffers
-	bool OnBoot();
 
 	bool PutIRC(const CString& sLine);
 	bool PutUser(const CString& sLine, CClient* pClient = NULL, CClient* pSkipClient = NULL);
diff --git a/znc.cpp b/znc.cpp
index eb327584..2c89f9c9 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -72,13 +72,13 @@ bool CZNC::OnBoot() {
 	if (!GetModules().OnBoot()) {
 		return false;
 	}
-#endif
 
 	for (map<CString,CUser*>::iterator it = m_msUsers.begin(); it != m_msUsers.end(); it++) {
-		if (!it->second->OnBoot()) {
+		if (!it->second->GetModules().OnBoot()) {
 			return false;
 		}
 	}
+#endif
 
 	return true;
 }