diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 653fe4d7..9ae1c69e 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -516,6 +516,7 @@ CURRENTLY DOING: PM stuff:
 	Pore over quote and PM and look for workorder remnants, particularly biz actions and rules
 	Add back end rules as necessary for quotes and PM's
 		Sanity checks for PM settings will be a must here
+			GenerateBeforeInterval must be less than repeatinterval
 	test help links
 	Child->grandchild data lists for quotes and pm's like workorders
 	release
diff --git a/ayanova/src/components/pm-header.vue b/ayanova/src/components/pm-header.vue
index a0f7e311..5a684d10 100644
--- a/ayanova/src/components/pm-header.vue
+++ b/ayanova/src/components/pm-header.vue
@@ -86,7 +86,6 @@
           </v-col>
           <v-col cols="5">
             <v-select
-              class="ml-1"
               v-model="value.repeatUnit"
               :items="pvm.selectLists.pmTimeUnits"
               item-text="name"
@@ -102,6 +101,40 @@
         </v-row>
       </v-col>
 
+      <v-col cols="12" sm="6" lg="4" xl="3">
+        <v-row>
+          <v-col cols="5">
+            <v-text-field
+              v-model="value.generateBeforeInterval"
+              :readonly="formState.readOnly"
+              :label="$ay.t('GenerateBefore')"
+              ref="generateBeforeInterval"
+              data-cy="generateBeforeInterval"
+              :rules="[form().integerValid(this, 'generateBeforeInterval')]"
+              :error-messages="
+                form().serverErrors(this, 'generateBeforeInterval')
+              "
+              @input="fieldValueChanged('generateBeforeInterval')"
+              type="number"
+            ></v-text-field>
+          </v-col>
+          <v-col cols="5">
+            <v-select
+              v-model="value.generateBeforeUnit"
+              :items="pvm.selectLists.pmTimeUnits"
+              item-text="name"
+              item-value="id"
+              :readonly="formState.readOnly"
+              :ref="`generateBeforeUnit`"
+              data-cy="usertype"
+              :rules="[form().integerValid(this, `generateBeforeUnit`)]"
+              :error-messages="form().serverErrors(this, `generateBeforeUnit`)"
+              @input="fieldValueChanged(`generateBeforeUnit`)"
+            ></v-select>
+          </v-col>
+        </v-row>
+      </v-col>
+
       <!-- ##################################################################################### -->
       <v-col
         v-if="