diff --git a/resources/assets/js/components/AkauntingDate.vue b/resources/assets/js/components/AkauntingDate.vue
index f083c93ac..72360c085 100644
--- a/resources/assets/js/components/AkauntingDate.vue
+++ b/resources/assets/js/components/AkauntingDate.vue
@@ -14,7 +14,7 @@
         <flat-picker slot-scope="{focus, blur}"
             @on-open="focus"
             @on-close="blur"
-            :config="config"
+            :config="dateConfig"
             class="form-control datepicker"
             v-model="real_model"
             @input="change"
@@ -67,7 +67,19 @@ export default {
             default: null,
             description: "Input model defalut"
         },
-        config: null,
+        dateConfig: {
+            type: Object,
+            default: function () {
+                return {
+                    allowInput: true,
+                    altFormat: "d M Y",
+                    altInput: true,
+                    dateFormat: "Y-m-d",
+                    wrap: true,
+                };
+            },
+            description: "FlatPckr date configuration"
+        },
         icon: {
             type: String,
             description: "Prepend icon (left)"
diff --git a/resources/views/partials/form/date_group.blade.php b/resources/views/partials/form/date_group.blade.php
index 73d09f6ff..96578d1e5 100644
--- a/resources/views/partials/form/date_group.blade.php
+++ b/resources/views/partials/form/date_group.blade.php
@@ -24,20 +24,21 @@
         :model="{{ $attributes['model'] }}"
         @endif
 
-        :config="{
+        :date-config="{
+            wrap: true, // set wrap to true only when using 'input-group'
             allowInput: true,
             @if (!empty($attributes['show-date-format']))
             altInput: true,
             altFormat: '{{ $attributes['show-date-format'] }}',
             @endif
             @if (!empty($attributes['date-format']))
-            dateFormat: '{{ $attributes['date-format'] }}'
+            dateFormat: '{{ $attributes['date-format'] }}',
             @endif
             @if (!empty($attributes['min-date']))
-            minDate: {{ $attributes['min-date'] }}
+            minDate: {{ $attributes['min-date'] }},
             @endif
             @if (!empty($attributes['max-date']))
-            maxDate: {{ $attributes['max-date'] }}
+            maxDate: {{ $attributes['max-date'] }},
             @endif
         }"
 
diff --git a/resources/views/partials/form/date_time_group.blade.php b/resources/views/partials/form/date_time_group.blade.php
index ea9adb367..3ebd2b18e 100644
--- a/resources/views/partials/form/date_time_group.blade.php
+++ b/resources/views/partials/form/date_time_group.blade.php
@@ -22,7 +22,7 @@
         :model="{{ $attributes['model'] }}"
         @endif
 
-        :config="{
+        :date-config="{
             allowInput: true,
             @if (!empty($attributes['show-date-format']))
             altInput: true,
@@ -34,13 +34,13 @@
             wrap: true,
             enableTime: true,
             @if (!empty($attributes['seconds']))
-            enableSeconds: true
+            enableSeconds: true,
             @endif
             @if (!empty($attributes['min-date']))
-            minDate: {{ $attributes['min-date'] }}
+            minDate: {{ $attributes['min-date'] }},
             @endif
             @if (!empty($attributes['max-date']))
-            maxDate: {{ $attributes['max-date'] }}
+            maxDate: {{ $attributes['max-date'] }},
             @endif
         }"