diff --git a/src/de/steamwar/bungeecore/commands/BauCommand.java b/src/de/steamwar/bungeecore/commands/BauCommand.java
index bfdb397..a57870a 100644
--- a/src/de/steamwar/bungeecore/commands/BauCommand.java
+++ b/src/de/steamwar/bungeecore/commands/BauCommand.java
@@ -209,8 +209,9 @@ public class BauCommand extends SWCommand {
         if (target == null)
             return;
 
-        target.setWorldEdit(!target.isWorldEdit());
-        target.setWorld(!target.isWorld());
+        boolean state = !target.isWorldEdit() || !target.isWorld();
+        target.setWorldEdit(state);
+        target.setWorld(state);
         clearMembercache(p);
         isAllowedTo(target.isWorldEdit(), p, target, "BAU_MEMBER_TOGGLE_WORLD_EDIT");
         isAllowedTo(target.isWorld(), p, target, "BAU_MEMBER_TOGGLE_WORLD");