diff --git a/ayanova/src/components/work-order-address.vue b/ayanova/src/components/work-order-address.vue
index 4c9eea74..a3f6692c 100644
--- a/ayanova/src/components/work-order-address.vue
+++ b/ayanova/src/components/work-order-address.vue
@@ -358,6 +358,11 @@
         </v-card-actions>
       </v-card>
     </v-dialog>
+    <div class="v-messages theme--light error--text mt-6" role="alert">
+      <div class="v-messages__wrapper">
+        <div class="v-messages__message">{{ allErrors }}</div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -374,7 +379,8 @@ export default {
     dataCy: { type: String, default: null },
     formKey: { type: String, default: "" }, //used to grab template from store
     readonly: Boolean,
-    disabled: Boolean
+    disabled: Boolean,
+    errorMessages: { type: Array, default: null }
   },
   data() {
     return {
@@ -393,6 +399,14 @@ export default {
     },
     displayServiceAddress() {
       return formatAddress(this.value).physical;
+    },
+    allErrors: function() {
+      let ret = "";
+
+      if (this.errorMessages != null && this.errorMessages.length > 0) {
+        ret += this.errorMessages.toString();
+      }
+      return ret;
     }
   },
 
diff --git a/ayanova/src/components/work-order-header.vue b/ayanova/src/components/work-order-header.vue
index 1ec3ca68..dffd7a9a 100644
--- a/ayanova/src/components/work-order-header.vue
+++ b/ayanova/src/components/work-order-header.vue
@@ -99,6 +99,7 @@
           :readonly="formState.readOnly || value.userIsRestrictedType"
           :pvm="pvm"
           data-cy="woAddress"
+          :error-messages="form().serverErrors(this, 'Address')"
         />
       </v-col>
 
diff --git a/ayanova/src/components/work-order-state.vue b/ayanova/src/components/work-order-state.vue
index 593c9ff9..9021a023 100644
--- a/ayanova/src/components/work-order-state.vue
+++ b/ayanova/src/components/work-order-state.vue
@@ -1,42 +1,57 @@
 <template>
   <div>
-    <div>
-      <div class="mb-n2 ml-10">
-        <span class="text-caption">{{ $ay.t("WorkOrderStatus") }}</span>
-      </div>
-      <template>
-        <div
-          class="mb-6 mb-sm-0"
-          :data-cy="`${dataCy}:open`"
-          @click="openDialog = true"
-        >
-          <v-btn icon class="ml-n1 mr-2">
-            <v-icon>{{ openIcon() }}</v-icon>
-          </v-btn>
+    <div class="mb-n2 ml-10">
+      <span class="text-caption">{{ $ay.t("WorkOrderStatus") }}</span>
+    </div>
+    <template>
+      <div
+        class="mb-6 mb-sm-0"
+        :data-cy="`${dataCy}:open`"
+        @click="openDialog = true"
+      >
+        <v-btn icon class="ml-n1 mr-2">
+          <v-icon>{{ openIcon() }}</v-icon>
+        </v-btn>
 
-          <span class="text-h6">{{ pvm.currentState.name }}</span>
-          <v-icon :color="pvm.currentState.color" class="ml-4">$ayiFlag</v-icon>
-          <v-icon v-if="pvm.currentState.locked" color="primary" class="ml-4"
-            >$ayiLock</v-icon
-          >
-          <v-icon v-if="pvm.currentState.completed" color="primary" class="ml-4"
-            >$ayiCheckCircle</v-icon
-          >
-        </div>
-      </template>
-      <v-row justify="center">
-        <v-dialog v-model="openDialog" max-width="600px">
-          <v-card>
-            <v-card-title>
-              <span class="text-h5">{{ $ay.t("WorkOrderStatus") }}</span>
-            </v-card-title>
-            <v-card-text>
-              <template v-if="$vuetify.breakpoint.smAndUp">
-                <!-- WIDE VIEW -->
-                <div v-for="item in stateDisplayList" :key="item.id">
-                  <span>{{ item.timeStamp }}</span>
-                  <span class="ml-3">{{ item.user }}</span>
-                  <span class="font-weight-bold ml-3">{{ item.name }}</span>
+        <span class="text-h6">{{ pvm.currentState.name }}</span>
+        <v-icon :color="pvm.currentState.color" class="ml-4">$ayiFlag</v-icon>
+        <v-icon v-if="pvm.currentState.locked" color="primary" class="ml-4"
+          >$ayiLock</v-icon
+        >
+        <v-icon v-if="pvm.currentState.completed" color="primary" class="ml-4"
+          >$ayiCheckCircle</v-icon
+        >
+      </div>
+    </template>
+    <v-row justify="center">
+      <v-dialog v-model="openDialog" max-width="600px">
+        <v-card>
+          <v-card-title>
+            <span class="text-h5">{{ $ay.t("WorkOrderStatus") }}</span>
+          </v-card-title>
+          <v-card-text>
+            <template v-if="$vuetify.breakpoint.smAndUp">
+              <!-- WIDE VIEW -->
+              <div v-for="item in stateDisplayList" :key="item.id">
+                <span>{{ item.timeStamp }}</span>
+                <span class="ml-3">{{ item.user }}</span>
+                <span class="font-weight-bold ml-3">{{ item.name }}</span>
+                <v-icon small :color="item.color" class="ml-4">$ayiFlag</v-icon>
+                <v-icon v-if="item.locked" small color="primary" class="ml-4"
+                  >$ayiLock</v-icon
+                >
+                <v-icon v-if="item.completed" small color="primary" class="ml-4"
+                  >$ayiCheckCircle</v-icon
+                >
+              </div>
+            </template>
+            <template v-else>
+              <!-- NARROW VIEW -->
+              <div v-for="item in stateDisplayList" :key="item.id">
+                <span>{{ item.timeStamp }}&nbsp;</span>
+                <span>{{ item.user }}</span>
+                <div class="mb-2">
+                  <span class="font-weight-bold">{{ item.name }}</span>
                   <v-icon small :color="item.color" class="ml-4"
                     >$ayiFlag</v-icon
                   >
@@ -51,103 +66,76 @@
                     >$ayiCheckCircle</v-icon
                   >
                 </div>
-              </template>
-              <template v-else>
-                <!-- NARROW VIEW -->
-                <div v-for="item in stateDisplayList" :key="item.id">
-                  <span>{{ item.timeStamp }}&nbsp;</span>
-                  <span>{{ item.user }}</span>
-                  <div class="mb-2">
-                    <span class="font-weight-bold">{{ item.name }}</span>
-                    <v-icon small :color="item.color" class="ml-4"
-                      >$ayiFlag</v-icon
-                    >
-                    <v-icon
-                      v-if="item.locked"
-                      small
-                      color="primary"
-                      class="ml-4"
-                      >$ayiLock</v-icon
-                    >
-                    <v-icon
-                      v-if="item.completed"
-                      small
-                      color="primary"
-                      class="ml-4"
-                      >$ayiCheckCircle</v-icon
-                    >
-                  </div>
-                </div>
-              </template>
-              <template v-if="canAdd">
-                <div class="mt-8">
-                  <v-autocomplete
-                    v-model="selectedStatus"
-                    :items="pvm.selectLists.allowedwostatus"
-                    item-text="name"
-                    item-value="id"
-                    dense
-                    :label="$ay.t('NewStatus')"
-                    prepend-icon="$ayiEdit"
-                    :data-cy="`${dataCy}:picker`"
-                    @click:prepend="handleEditStateClick()"
-                  >
-                    <template v-slot:item="data">
-                      <v-list-item-avatar>
-                        <v-icon :color="data.item.color">$ayiFlag</v-icon>
-                      </v-list-item-avatar>
-                      <v-list-item-content>
-                        <v-list-item-title
-                          ><span class="text-subtitle-2">{{
-                            data.item.name
-                          }}</span
-                          ><v-icon
-                            v-if="data.item.locked"
-                            small
-                            color="disabled"
-                            class="ml-2"
-                            >$ayiLock</v-icon
-                          >
-                          <v-icon
-                            v-if="data.item.completed"
-                            color="disabled"
-                            class="ml-1"
-                            small
-                            >$ayiCheckCircle</v-icon
-                          ></v-list-item-title
+              </div>
+            </template>
+            <template v-if="canAdd">
+              <div class="mt-8">
+                <v-autocomplete
+                  v-model="selectedStatus"
+                  :items="pvm.selectLists.allowedwostatus"
+                  item-text="name"
+                  item-value="id"
+                  dense
+                  :label="$ay.t('NewStatus')"
+                  prepend-icon="$ayiEdit"
+                  :data-cy="`${dataCy}:picker`"
+                  @click:prepend="handleEditStateClick()"
+                >
+                  <template v-slot:item="data">
+                    <v-list-item-avatar>
+                      <v-icon :color="data.item.color">$ayiFlag</v-icon>
+                    </v-list-item-avatar>
+                    <v-list-item-content>
+                      <v-list-item-title
+                        ><span class="text-subtitle-2">{{
+                          data.item.name
+                        }}</span
+                        ><v-icon
+                          v-if="data.item.locked"
+                          small
+                          color="disabled"
+                          class="ml-2"
+                          >$ayiLock</v-icon
                         >
+                        <v-icon
+                          v-if="data.item.completed"
+                          color="disabled"
+                          class="ml-1"
+                          small
+                          >$ayiCheckCircle</v-icon
+                        ></v-list-item-title
+                      >
 
-                        <v-list-item-subtitle>
-                          {{ data.item.notes }}</v-list-item-subtitle
-                        >
-                      </v-list-item-content>
-                      <v-list-item-action> </v-list-item-action>
-                    </template>
-                  </v-autocomplete>
-                </div>
-              </template>
-            </v-card-text>
-            <v-card-actions>
-              <v-spacer></v-spacer>
-              <v-btn color="blue darken-1" text @click="cancelDialog()">{{
-                $ay.t("Cancel")
-              }}</v-btn>
-              <v-btn
-                color="blue darken-1"
-                :disabled="selectedStatus == null"
-                text
-                :data-cy="`${dataCy}:btnok`"
-                @click="save()"
-                >{{ $ay.t("OK") }}</v-btn
-              >
-            </v-card-actions>
-          </v-card>
-        </v-dialog>
-      </v-row>
-      <div class="v-messages theme--light error--text mt-6" role="alert">
-        <div class="v-messages__wrapper">
-          <div class="v-messages__message">{{ allErrors }}</div>
-        </div>
+                      <v-list-item-subtitle>
+                        {{ data.item.notes }}</v-list-item-subtitle
+                      >
+                    </v-list-item-content>
+                    <v-list-item-action> </v-list-item-action>
+                  </template>
+                </v-autocomplete>
+              </div>
+            </template>
+          </v-card-text>
+          <v-card-actions>
+            <v-spacer></v-spacer>
+            <v-btn color="blue darken-1" text @click="cancelDialog()">{{
+              $ay.t("Cancel")
+            }}</v-btn>
+            <v-btn
+              color="blue darken-1"
+              :disabled="selectedStatus == null"
+              text
+              :data-cy="`${dataCy}:btnok`"
+              @click="save()"
+              >{{ $ay.t("OK") }}</v-btn
+            >
+          </v-card-actions>
+        </v-card>
+      </v-dialog>
+    </v-row>
+    <div class="v-messages theme--light error--text mt-6" role="alert">
+      <div class="v-messages__wrapper">
+        <div class="v-messages__message">{{ allErrors }}</div>
       </div>
     </div>
   </div>