diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
index e924c7f8..0a63b543 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
@@ -289,12 +289,14 @@ public void onBlockIgnite(BlockIgniteEvent event) {
             event.setCancelled(true);
             return;
         }
-        /*
-        if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL) {
+
+        if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL
+                && event.getPlayer() != null
+                && !plugin.hasPermission(event.getPlayer(), "worldguard.override.lighter")) {
             event.setCancelled(true);
             return;
         }
-        */
+
         if (wcfg.fireSpreadDisableToggle && isFireSpread) {
             event.setCancelled(true);
             return;
@@ -324,16 +326,16 @@ public void onBlockIgnite(BlockIgniteEvent event) {
             if (player != null && !plugin.getGlobalRegionManager().hasBypass(player, world)) {
                 LocalPlayer localPlayer = plugin.wrapPlayer(player);
 
-                if (cause == IgniteCause.FLINT_AND_STEEL
-                        && !set.canBuild(localPlayer)) {
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (cause == IgniteCause.FLINT_AND_STEEL
-                        && !set.allows(DefaultFlag.LIGHTER)) {
-                    event.setCancelled(true);
-                    return;
+                if (cause == IgniteCause.FLINT_AND_STEEL) {
+                    if (!set.canBuild(localPlayer)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                    if (!set.allows(DefaultFlag.LIGHTER)
+                            && !plugin.hasPermission(player, "worldguard.override.lighter")) {
+                        event.setCancelled(true);
+                        return;
+                    }
                 }
             }
 
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
index 3c6534c4..64e318db 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
@@ -338,13 +338,6 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
         ConfigurationManager cfg = plugin.getGlobalStateManager();
         WorldConfiguration wcfg = cfg.get(world);
 
-        if (wcfg.blockLighter && item.getType() == Material.FLINT_AND_STEEL) {
-            if (!plugin.hasPermission(player, "worldguard.lighter.override")) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-        
         // Infinite stack removal
         if ((type == Material.CHEST
                 || type == Material.JUKEBOX
@@ -390,15 +383,6 @@ private void handleBlockRightClick(PlayerInteractEvent event) {
                 return;
             }
 
-            if (item.getType() == Material.FLINT_AND_STEEL) {
-                if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                    && !set.allows(DefaultFlag.LIGHTER)
-                    && !plugin.hasPermission(player, "worldguard.lighter.override")) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
             if (type == Material.CHEST
                     || type == Material.JUKEBOX //stores the (arguably) most valuable item
                     || type == Material.DISPENSER