diff --git a/system/scripts/actor.js b/system/scripts/actor.js
index 8e3037c..438253c 100644
--- a/system/scripts/actor.js
+++ b/system/scripts/actor.js
@@ -79,13 +79,19 @@ export class ActorL5r5e extends Actor {
             data.endurance = (Number(data.rings.earth) + Number(data.rings.fire)) * 2;
             data.composure = (Number(data.rings.earth) + Number(data.rings.water)) * 2;
             data.focus = Number(data.rings.air) + Number(data.rings.fire);
-            data.vigilance = Math.ceil((Number(data.rings.air) + Number(data.rings.water)) / 2);
 
             // Attributes bars
             data.void_points.max = data.rings.void;
             data.fatigue.max = data.endurance;
             data.strife.max = data.composure;
 
+            // if compromise, vigilance = 1
+            if (data.strife.value > data.strife.max) {
+                data.vigilance = 1;
+            } else {
+                data.vigilance = Math.ceil((Number(data.rings.air) + Number(data.rings.water)) / 2);
+            }
+
             // Make sure void points are never greater than max
             if (data.void_points.value > data.void_points.max) {
                 data.void_points.value = data.void_points.max;
diff --git a/system/templates/actors/character/attributes.html b/system/templates/actors/character/attributes.html
index 4cd303c..33720ef 100644
--- a/system/templates/actors/character/attributes.html
+++ b/system/templates/actors/character/attributes.html
@@ -28,7 +28,7 @@
         </label>
         <p class="item-description"> {{ localize 'l5r5e.attributes.focustip' }}</p>
     </li>
-    <li class="vigilance-content">
+    <li class="vigilance-content {{#ifCond data.strife.value '>' data.strife.max}}compromised{{/ifCond}}">
         <label class="attribute-label">
             <strong>{{ localize 'l5r5e.attributes.vigilance' }}</strong>
             <input class="centered-input" type="text" name="data.vigilance" value="{{data.vigilance}}" data-dtype="Number" disabled/>
diff --git a/system/templates/actors/npc/attributes.html b/system/templates/actors/npc/attributes.html
index 4cd303c..33720ef 100644
--- a/system/templates/actors/npc/attributes.html
+++ b/system/templates/actors/npc/attributes.html
@@ -28,7 +28,7 @@
         </label>
         <p class="item-description"> {{ localize 'l5r5e.attributes.focustip' }}</p>
     </li>
-    <li class="vigilance-content">
+    <li class="vigilance-content {{#ifCond data.strife.value '>' data.strife.max}}compromised{{/ifCond}}">
         <label class="attribute-label">
             <strong>{{ localize 'l5r5e.attributes.vigilance' }}</strong>
             <input class="centered-input" type="text" name="data.vigilance" value="{{data.vigilance}}" data-dtype="Number" disabled/>