diff --git a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
index ac00d5eab..190f0864f 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
@@ -135,8 +135,8 @@ public class EssentialsBlockListener extends BlockListener
 						return;
 					} else {
 						Essentials.getWarps().getWarp(event.getLine(1));
-						if (event.getLine(2).equalsIgnoreCase("Free")) {
-							event.setLine(2, "§2Free");
+						if (event.getLine(2).equalsIgnoreCase("Everyone")) {
+							event.setLine(2, "§2Everyone");
 						}
 						event.setLine(0, "§1[Warp]");						
 					}
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 6ffd8aef9..7ae8e24f7 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -370,7 +370,7 @@ public class EssentialsPlayerListener extends PlayerListener
 					}
 				}
 				if (!sign.getLine(2).isEmpty()) {
-					if (sign.getLine(2).equals("§2Free")) {
+					if (sign.getLine(2).equals("§2Everyone")) {
 						user.teleportCooldown();
 						user.warpTo(sign.getLine(1));
 						return;