diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index c1b5132f4..d06b30aee 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -78,7 +78,7 @@ public class EssentialsPlayerListener implements Listener
 	{
 		if (!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 
 			if (ess.getSettings().isDebug())
 			{
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
index ef14f7818..ab914c629 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignBlockListener.java
@@ -32,7 +32,7 @@ public class SignBlockListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 
@@ -81,7 +81,7 @@ public class SignBlockListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 		User user = ess.getUser(event.getPlayer());
@@ -107,7 +107,7 @@ public class SignBlockListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 
@@ -132,7 +132,7 @@ public class SignBlockListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 
@@ -166,7 +166,7 @@ public class SignBlockListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 
@@ -195,7 +195,7 @@ public class SignBlockListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 
@@ -224,7 +224,7 @@ public class SignBlockListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 
@@ -255,7 +255,7 @@ public class SignBlockListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
index 97bf0fa58..fbbd1cd8c 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignEntityListener.java
@@ -24,7 +24,7 @@ public class SignEntityListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 		
@@ -54,7 +54,7 @@ public class SignEntityListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
index 90f0333cb..b447ed9dd 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java
@@ -30,7 +30,7 @@ public class SignPlayerListener implements Listener
 	{
 		if (ess.getSettings().areSignsDisabled())
 		{
-			event.getHandlers().unregister(ess);
+			event.getHandlers().unregister(this);
 			return;
 		}
 		if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR)