diff --git a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
index d3b76fd3..3c4e41de 100644
--- a/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
+++ b/src/com/massivecraft/factions/listeners/FactionsEntityListener.java
@@ -173,15 +173,6 @@ public class FactionsEntityListener extends EntityListener {
 			return true;
 		}
 		
-		if (!attacker.hasFaction() && Conf.disablePVPForFactionlessPlayers) {
-			attacker.sendMessage("You can't hurt other players until you join a faction.");
-			return false;
-		}
-		else if (!defender.hasFaction() && Conf.disablePVPForFactionlessPlayers) {
-			attacker.sendMessage("You can't hurt players who are not currently in a faction.");
-			return false;
-		}
-		
 		if (attacker.hasLoginPvpDisabled()) {
 			attacker.sendMessage("You can't hurt other players for " + Conf.noPVPDamageToOthersForXSecondsAfterLogin + " seconds after logging in.");
 			return false;
@@ -198,6 +189,15 @@ public class FactionsEntityListener extends EntityListener {
 			return true;
 		}
 		
+		if (!attacker.hasFaction() && Conf.disablePVPForFactionlessPlayers) {
+			attacker.sendMessage("You can't hurt other players until you join a faction.");
+			return false;
+		}
+		else if (!defender.hasFaction() && Conf.disablePVPForFactionlessPlayers) {
+			attacker.sendMessage("You can't hurt players who are not currently in a faction.");
+			return false;
+		}
+		
 		Relation relation = defender.getRelation(attacker);
 		
 		// You can not hurt neutral factions