diff --git a/ayanova/src/components/date-control.vue b/ayanova/src/components/date-control.vue
index 8b769a66..69ae500c 100644
--- a/ayanova/src/components/date-control.vue
+++ b/ayanova/src/components/date-control.vue
@@ -1,16 +1,28 @@
 <template>
-  <v-text-field
-    ref="dateField"
-    :value="dateControlFormat()"
-    @input="handleDateInput"
-    :readonly="readonly"
-    :disabled="disabled"
-    :label="label"
-    :rules="rules"
-    type="date"
-    :error-messages="allErrors()"
-    :data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
-  ></v-text-field>
+  <div>
+    <template v-if="!readonly">
+      <v-text-field
+        ref="dateField"
+        :value="dateControlFormat()"
+        @input="handleDateInput"
+        :readonly="readonly"
+        :disabled="disabled"
+        :label="label"
+        :rules="rules"
+        type="date"
+        :error-messages="allErrors()"
+        :data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
+      ></v-text-field>
+    </template>
+    <template v-else>
+      <v-text-field
+        :value="readonlyFormat()"
+        :label="label"
+        readonly
+        disabled
+      ></v-text-field>
+    </template>
+  </div>
 </template>
 <script>
 /*  Xeslint-disable */
@@ -50,6 +62,14 @@ export default {
       }
       return ret;
     },
+    readonlyFormat() {
+      return window.$gz.locale.utcDateToShortDateLocalized(
+        this.internalValue,
+        this.timeZoneName,
+        this.languageName,
+        this.hour12
+      );
+    },
     dateControlFormat() {
       //yyyy-mm-dd
       return window.$gz.locale.utcDateStringToLocal8601DateOnlyString(
diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue
index 8f4fe741..002033f6 100644
--- a/ayanova/src/components/date-time-control.vue
+++ b/ayanova/src/components/date-time-control.vue
@@ -1,30 +1,40 @@
 <template>
   <v-row>
-    <v-col cols="6">
+    <template v-if="!readonly">
+      <v-col cols="6">
+        <v-text-field
+          ref="dateField"
+          :value="dateControlFormat()"
+          @input="handleDateInput"
+          :readonly="readonly"
+          :disabled="disabled"
+          :label="label"
+          :rules="rules"
+          type="date"
+          :error-messages="allErrors()"
+          :data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
+        ></v-text-field>
+      </v-col>
+      <v-col cols="6">
+        <v-text-field
+          ref="timeField"
+          :value="timeControlFormat()"
+          @input="handleTimeInput"
+          :readonly="readonly"
+          :disabled="disabled"
+          type="time"
+          :data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
+        ></v-text-field>
+      </v-col>
+    </template>
+    <template v-else>
       <v-text-field
-        ref="dateField"
-        :value="dateControlFormat()"
-        @input="handleDateInput"
-        :readonly="readonly"
-        :disabled="disabled"
+        :value="readonlyFormat()"
         :label="label"
-        :rules="rules"
-        type="date"
-        :error-messages="allErrors()"
-        :data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
+        readonly
+        disabled
       ></v-text-field>
-    </v-col>
-    <v-col cols="6">
-      <v-text-field
-        ref="timeField"
-        :value="timeControlFormat()"
-        @input="handleTimeInput"
-        :readonly="readonly"
-        :disabled="disabled"
-        type="time"
-        :data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
-      ></v-text-field>
-    </v-col>
+    </template>
   </v-row>
 </template>
 <script>
@@ -66,6 +76,14 @@ export default {
       }
       return ret;
     },
+    readonlyFormat() {
+      return window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+        this.internalValue,
+        this.timeZoneName,
+        this.languageName,
+        this.hour12
+      );
+    },
     dateControlFormat() {
       //yyyy-mm-dd
       return window.$gz.locale.utcDateStringToLocal8601DateOnlyString(
diff --git a/ayanova/src/components/time-control.vue b/ayanova/src/components/time-control.vue
index 5dfc2d38..fafd0684 100644
--- a/ayanova/src/components/time-control.vue
+++ b/ayanova/src/components/time-control.vue
@@ -1,17 +1,30 @@
 <template>
-  <v-text-field
-    ref="timeField"
-    :value="timeControlFormat()"
-    @input="handleTimeInput"
-    :readonly="readonly"
-    :disabled="disabled"
-    :label="label"
-    :rules="rules"
-    :error-messages="allErrors()"
-    type="time"
-    :data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
-  ></v-text-field>
+  <div>
+    <template v-if="!readonly">
+      <v-text-field
+        ref="timeField"
+        :value="timeControlFormat()"
+        @input="handleTimeInput"
+        :readonly="readonly"
+        :disabled="disabled"
+        :label="label"
+        :rules="rules"
+        :error-messages="allErrors()"
+        type="time"
+        :data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
+      ></v-text-field>
+    </template>
+    <template v-else>
+      <v-text-field
+        :value="readonlyFormat()"
+        :label="label"
+        readonly
+        disabled
+      ></v-text-field>
+    </template>
+  </div>
 </template>
+
 <script>
 //==========================================
 //==========================================
@@ -51,6 +64,14 @@ export default {
       }
       return ret;
     },
+    readonlyFormat() {
+      return window.$gz.locale.utcDateToShortTimeLocalized(
+        this.internalValue,
+        this.timeZoneName,
+        this.languageName,
+        this.hour12
+      );
+    },
     timeControlFormat() {
       //hh:mm:ss in 24 hour format
       return window.$gz.locale.utcDateStringToLocal8601TimeOnlyString(
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 13bb8738..d50242ad 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -133,7 +133,16 @@
                 @click:append-outer="reveal = !reveal"
               ></v-text-field>
             </v-col>
-
+            <v-col cols="12" sm="6" lg="4" xl="3">
+              <gz-date-time-picker
+                :label="$ay.t('LastLogin')"
+                v-model="obj.lastLogin"
+                readonly
+                disabled
+                ref="lastLogin"
+                testId="lastLogin"
+              ></gz-date-time-picker>
+            </v-col>
             <v-col v-if="form().showMe(this, 'Notes')" cols="12">
               <v-textarea
                 v-model="obj.notes"