diff --git a/src/components/OrderN.vue b/src/components/OrderN.vue
index ea65e7e..7701106 100644
--- a/src/components/OrderN.vue
+++ b/src/components/OrderN.vue
@@ -7,7 +7,7 @@
       </h2>
       <div class="flex-row">
         dla pociągu nr <input type="text" v-model="order.header.trainNo" placeholder="nr pociągu" /> dnia
-        <input type="text" v-model="order.header.date" placeholder="data" /> {{ new Date().getUTCFullYear() }}r.
+        <input type="text" v-model="order.header.date" placeholder="data" />
       </div>
     </section>
     <section class="table-section">
@@ -296,7 +296,7 @@ export default defineComponent({
 
         const message = `<i>Rozkaz pisemny "N" nr ${header.orderNo || '_'} dla pociągu nr ${
           header.trainNo || '_'
-        } dnia ${header.date} ${new Date().getUTCFullYear()}r.</i>`;
+        } dnia ${header.date}</i>`;
 
         return message;
       },
diff --git a/src/components/OrderO.vue b/src/components/OrderO.vue
index c9aa5da..f4d7bad 100644
--- a/src/components/OrderO.vue
+++ b/src/components/OrderO.vue
@@ -8,7 +8,7 @@
 
       <div class="flex-row" style="padding: 0 0.5em">
         dla pociągu nr <input type="text" v-model="order.header.trainNo" /> dnia
-        <input type="text" v-model="order.header.date" /> {{ new Date().getUTCFullYear() }}r.
+        <input type="text" v-model="order.header.date" />
       </div>
 
       <div class="horizontal-bar"></div>
@@ -90,7 +90,7 @@ export default defineComponent({
 
         return `<i>Rozkaz pisemny "O" nr ${header.orderNo || '_'} dla pociągu nr ${header.trainNo || '_'} dnia ${
           header.date || '_'
-        } ${new Date().getUTCFullYear()}r.</i> <b> [ 1 ] </b> 1) zmniejszyć prędkość jazdy i zachować ostrożność, 2) jechać ostrożnie (j.o.)`;
+        }</i> <b> [ 1 ] </b> 1) zmniejszyć prędkość jazdy i zachować ostrożność, 2) jechać ostrożnie (j.o.)`;
       },
     ];
 
diff --git a/src/components/OrderS.vue b/src/components/OrderS.vue
index 1b91468..06e30d6 100644
--- a/src/components/OrderS.vue
+++ b/src/components/OrderS.vue
@@ -12,7 +12,7 @@
           <option value="manewru">manewru</option>
         </select>
         nr <input type="text" v-model="order.header.trainNo" :placeholder="`nr ${order.header.for}`" /> dnia
-        <input type="text" v-model="order.header.date" placeholder="data" /> {{ new Date().getUTCFullYear() }}r.
+        <input type="text" v-model="order.header.date" placeholder="data" />
       </div>
     </section>
     <section class="table-section">
@@ -238,7 +238,7 @@ export default defineComponent({
 
         return `<i>Rozkaz pisemny "S" nr ${header.orderNo || '_'} dla ${header.for || '_'} nr ${
           header.trainNo || '_'
-        } dnia ${header.date || '_'} ${new Date().getUTCFullYear()}r.</i>`;
+        } dnia ${header.date || '_'}</i>`;
       },
 
       () => {
@@ -304,7 +304,7 @@ export default defineComponent({
     };
   },
 
-  activated() {
+activated() {
     this.generateMessage();
   },
 
diff --git a/src/store/store.ts b/src/store/store.ts
index 1181b9d..45af994 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -27,7 +27,7 @@ export const useStore = defineStore('store', {
         header: {
           orderNo: '1',
           trainNo: '',
-          date: new Date().toLocaleDateString('pl-PL', { day: 'numeric', month: 'long' }),
+          date: new Date().toLocaleDateString('pl-PL', { day: 'numeric', month: 'numeric', year: 'numeric' }) + "r.",
         },
 
         orderList: [
@@ -79,7 +79,7 @@ export const useStore = defineStore('store', {
         header: {
           orderNo: '1',
           trainNo: '',
-          date: new Date().toLocaleDateString('pl-PL', { day: 'numeric', month: 'long' }),
+          date: new Date().toLocaleDateString('pl-PL', { day: 'numeric', month: 'numeric', year: 'numeric' }) + "r.",
         },
 
         rows: [
@@ -141,7 +141,7 @@ export const useStore = defineStore('store', {
           orderNo: '1',
           trainNo: '',
           for: 'pociągu',
-          date: new Date().toLocaleDateString('pl-PL', { day: 'numeric', month: 'long' }),
+          date: new Date().toLocaleDateString('pl-PL', { day: 'numeric', month: 'numeric', year: 'numeric' }) + "r.",
         },
 
         rows: [
@@ -183,3 +183,5 @@ export const useStore = defineStore('store', {
   },
 });
 
+
+