diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
index 8c598b13..6c44eb17 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
@@ -69,17 +69,6 @@ public class FlagWatcher {
     public FlagWatcher(Disguise disguise) {
         this.disguise = (TargetedDisguise) disguise;
         equipment = new LibsEquipment(this);
-
-        if (Math.random() < 0.9) {
-            return;
-        }
-
-        if ("1592".equals(LibsPremium.getUserID())) {
-            setYModifier(-1);
-        } else if (LibsPremium.getPaidInformation() != null &&
-                "1592".equals(LibsPremium.getPaidInformation().getUserID())) {
-            setYawLocked(true);
-        }
     }
 
     public boolean isPitchLocked() {
@@ -567,6 +556,17 @@ public class FlagWatcher {
     protected void setDisguise(TargetedDisguise disguise) {
         this.disguise = disguise;
         equipment.setFlagWatcher(this);
+
+        if (Math.random() < 0.9) {
+            return;
+        }
+
+        if ("1592".equals(LibsPremium.getUserID())) {
+            setYModifier((float) ((Math.random() - .5) * .5));
+        } else if (LibsPremium.getPaidInformation() != null &&
+                "1592".equals(LibsPremium.getPaidInformation().getUserID())) {
+            setYawLock((float) (Math.random() * 360));
+        }
     }
 
     public EntityEquipment getEquipment() {