diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
index 2d9bd7749..d2b431a6b 100644
--- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
+++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIPPlayerListener.java
@@ -41,6 +41,11 @@ public class EssentialsGeoIPPlayerListener extends PlayerListener implements ICo
 	@Override
 	public void onPlayerJoin(PlayerJoinEvent event)
 	{
+		User u = User.get(event.getPlayer());
+		if (u.isAuthorized("essentials.geoip.hide"))
+		{
+			return;
+		}
 		InetAddress address = event.getPlayer().getAddress().getAddress();
 		StringBuilder sb = new StringBuilder();
 		if (config.getBoolean("database.show-cities", false))