diff --git a/modules/extra/notify_connect.cpp b/modules/extra/notify_connect.cpp
index 44f7dfd7..5b712339 100644
--- a/modules/extra/notify_connect.cpp
+++ b/modules/extra/notify_connect.cpp
@@ -6,32 +6,25 @@
  * by the Free Software Foundation.
  */
 
-#include "main.h"
-#include "User.h"
-#include "Nick.h"
-#include "Modules.h"
-#include "Chan.h"
 #include "znc.h"
+#include "User.h"
 
 class CNotifyConnectMod : public CGlobalModule {
 public:
 	GLOBALMODCONSTRUCTOR(CNotifyConnectMod) {}
 
-	virtual void OnClientLogin()
-	{
-		SendAdmins(m_pUser->GetUserName() + " attached");
+	virtual void OnClientLogin() {
+		SendAdmins(m_pUser->GetUserName() + " attached (from " + m_pClient->GetRemoteIP() + ")");
 	}
 
-	virtual void OnClientDisconnect()
-	{
-		SendAdmins(m_pUser->GetUserName() + " detached");
+	virtual void OnClientDisconnect() {
+		SendAdmins(m_pUser->GetUserName() + " detached (gone: " + m_pClient->GetRemoteIP() + ")");
 	}
 
 private:
-	void SendAdmins(const CString &msg)
-	{
+	void SendAdmins(const CString &msg) {
 		CZNC::Get().Broadcast(msg, true, NULL, GetClient());
 	}
 };
 
-GLOBALMODULEDEFS(CNotifyConnectMod, "");
+GLOBALMODULEDEFS(CNotifyConnectMod, "Notifies all admin users when a client connects or disconnects.");