diff --git a/src/identification.js b/src/identification.js
index a3386cb1..ea4cca28 100644
--- a/src/identification.js
+++ b/src/identification.js
@@ -30,10 +30,10 @@ class Identification {
 				var address = server.address();
 				log.info(`Identd server available on ${colors.green(address.address + ":" + address.port)}`);
 
-				startedCallback();
+				startedCallback(this);
 			});
 		} else {
-			startedCallback();
+			startedCallback(this);
 		}
 	}
 
diff --git a/src/plugins/irc-events/connection.js b/src/plugins/irc-events/connection.js
index fb2fdb74..a8ecef54 100644
--- a/src/plugins/irc-events/connection.js
+++ b/src/plugins/irc-events/connection.js
@@ -6,7 +6,6 @@ var Helper = require("../../helper");
 
 module.exports = function(irc, network) {
 	var client = this;
-	var identHandler = this.manager.identHandler;
 
 	network.channels[0].pushMessage(client, new Msg({
 		text: "Network created, connecting to " + network.host + ":" + network.port + "..."
@@ -65,12 +64,12 @@ module.exports = function(irc, network) {
 	let identSocketId;
 
 	irc.on("raw socket connected", function(socket) {
-		identSocketId = identHandler.addSocket(socket, client.name || network.username);
+		identSocketId = client.manager.identHandler.addSocket(socket, client.name || network.username);
 	});
 
 	irc.on("socket close", function() {
 		if (identSocketId > 0) {
-			identHandler.removeSocket(identSocketId);
+			client.manager.identHandler.removeSocket(identSocketId);
 			identSocketId = 0;
 		}
 	});
diff --git a/src/server.js b/src/server.js
index 347214c4..636b5ab6 100644
--- a/src/server.js
+++ b/src/server.js
@@ -13,7 +13,6 @@ var ldap = require("ldapjs");
 var colors = require("colors/safe");
 const Identification = require("./identification");
 
-let identHandler = null;
 var manager = null;
 var authFunction = localAuth;
 
@@ -89,7 +88,7 @@ in ${config.public ? "public" : "private"} mode`);
 
 	manager = new ClientManager();
 
-	identHandler = new Identification(() => {
+	new Identification((identHandler) => {
 		manager.init(identHandler, sockets);
 	});
 };