diff --git a/bukkit/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java b/bukkit/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java
index 178e3d7..d3608e3 100644
--- a/bukkit/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java
+++ b/bukkit/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java
@@ -1222,8 +1222,8 @@ public class FlagDefinitionRegistryModule implements CatalogRegistryModule<FlagD
         flagContexts = new HashSet<>();
         flagContexts.add(FlagContexts.SOURCE_FIRE);
         definitionContexts = new HashSet<>();
-        definitionContexts.add(ClaimContexts.GLOBAL_OVERRIDE_CONTEXT);
-        //definitionContexts.add(OWNER_OVERRIDE_CONTEXT);
+        definitionContexts.add(ClaimContexts.USER_DEFAULT_CONTEXT);
+        definitionContexts.add(OWNER_OVERRIDE_CONTEXT);
         flagData = new ArrayList<>();
         flagData.add(flagDataBuilder
                         .reset()
diff --git a/sponge/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java b/sponge/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java
index 178e3d7..d3608e3 100644
--- a/sponge/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java
+++ b/sponge/src/main/java/com/griefdefender/registry/FlagDefinitionRegistryModule.java
@@ -1222,8 +1222,8 @@ public class FlagDefinitionRegistryModule implements CatalogRegistryModule<FlagD
         flagContexts = new HashSet<>();
         flagContexts.add(FlagContexts.SOURCE_FIRE);
         definitionContexts = new HashSet<>();
-        definitionContexts.add(ClaimContexts.GLOBAL_OVERRIDE_CONTEXT);
-        //definitionContexts.add(OWNER_OVERRIDE_CONTEXT);
+        definitionContexts.add(ClaimContexts.USER_DEFAULT_CONTEXT);
+        definitionContexts.add(OWNER_OVERRIDE_CONTEXT);
         flagData = new ArrayList<>();
         flagData.add(flagDataBuilder
                         .reset()