diff --git a/aurelia-bootstrap-datetimepicker/dist/amd/abp-datetime-picker.html b/aurelia-bootstrap-datetimepicker/dist/amd/abp-datetime-picker.html
index 11e9ab1d0..fbf289c8a 100644
--- a/aurelia-bootstrap-datetimepicker/dist/amd/abp-datetime-picker.html
+++ b/aurelia-bootstrap-datetimepicker/dist/amd/abp-datetime-picker.html
@@ -2,7 +2,7 @@
   <!-- Bootstrap version 3 -->
     <div if.bind="bootstrapVersion == 3" class.bind="parseBool(withDateIcon) ? 'input-group date' : 'date'">
         <input type="text" class="form-control datetimepicker"
-               value.bind="value"
+               value.two-way="value & updateTrigger:'blur'"
                model.bind="model"
                blur.trigger="blur()"
                placeholder.bind="placeholder"
@@ -16,7 +16,7 @@
     <!-- Bootstrap version 4 -->
     <div if.bind="bootstrapVersion == 4" class.bind="parseBool(withDateIcon) ? 'input-group' : 'date'">
         <input type="text" class="form-control date datetimepicker"
-               value.bind="value"
+               value.two-way="value & updateTrigger:'blur'"
                model.bind="model"
                blur.trigger="blur()"
                placeholder.bind="placeholder"
diff --git a/aurelia-bootstrap-datetimepicker/dist/amd/abp-datetime-picker.js b/aurelia-bootstrap-datetimepicker/dist/amd/abp-datetime-picker.js
index fc192506a..a6722815f 100644
--- a/aurelia-bootstrap-datetimepicker/dist/amd/abp-datetime-picker.js
+++ b/aurelia-bootstrap-datetimepicker/dist/amd/abp-datetime-picker.js
@@ -207,7 +207,7 @@ define(['exports', 'aurelia-framework', 'moment', 'jquery', './picker-global-opt
           this.model = (0, _moment2.default)(value, this._format, true).toDate();
         }
         if (!this.value) {
-          this.value = (0, _moment2.default)(value, this._format, true);
+          this.value = (0, _moment2.default)(value, this._format, true).format(this._format);
         }
       }
     };
diff --git a/aurelia-bootstrap-datetimepicker/dist/commonjs/abp-datetime-picker.html b/aurelia-bootstrap-datetimepicker/dist/commonjs/abp-datetime-picker.html
index 11e9ab1d0..fbf289c8a 100644
--- a/aurelia-bootstrap-datetimepicker/dist/commonjs/abp-datetime-picker.html
+++ b/aurelia-bootstrap-datetimepicker/dist/commonjs/abp-datetime-picker.html
@@ -2,7 +2,7 @@
   <!-- Bootstrap version 3 -->
     <div if.bind="bootstrapVersion == 3" class.bind="parseBool(withDateIcon) ? 'input-group date' : 'date'">
         <input type="text" class="form-control datetimepicker"
-               value.bind="value"
+               value.two-way="value & updateTrigger:'blur'"
                model.bind="model"
                blur.trigger="blur()"
                placeholder.bind="placeholder"
@@ -16,7 +16,7 @@
     <!-- Bootstrap version 4 -->
     <div if.bind="bootstrapVersion == 4" class.bind="parseBool(withDateIcon) ? 'input-group' : 'date'">
         <input type="text" class="form-control date datetimepicker"
-               value.bind="value"
+               value.two-way="value & updateTrigger:'blur'"
                model.bind="model"
                blur.trigger="blur()"
                placeholder.bind="placeholder"
diff --git a/aurelia-bootstrap-datetimepicker/dist/commonjs/abp-datetime-picker.js b/aurelia-bootstrap-datetimepicker/dist/commonjs/abp-datetime-picker.js
index 04514d08e..8c3f67f13 100644
--- a/aurelia-bootstrap-datetimepicker/dist/commonjs/abp-datetime-picker.js
+++ b/aurelia-bootstrap-datetimepicker/dist/commonjs/abp-datetime-picker.js
@@ -208,7 +208,7 @@ var AbpDatetimePickerCustomElement = exports.AbpDatetimePickerCustomElement = (_
         this.model = (0, _moment2.default)(value, this._format, true).toDate();
       }
       if (!this.value) {
-        this.value = (0, _moment2.default)(value, this._format, true);
+        this.value = (0, _moment2.default)(value, this._format, true).format(this._format);
       }
     }
   };
diff --git a/aurelia-bootstrap-datetimepicker/dist/es2015/abp-datetime-picker.html b/aurelia-bootstrap-datetimepicker/dist/es2015/abp-datetime-picker.html
index 11e9ab1d0..fbf289c8a 100644
--- a/aurelia-bootstrap-datetimepicker/dist/es2015/abp-datetime-picker.html
+++ b/aurelia-bootstrap-datetimepicker/dist/es2015/abp-datetime-picker.html
@@ -2,7 +2,7 @@
   <!-- Bootstrap version 3 -->
     <div if.bind="bootstrapVersion == 3" class.bind="parseBool(withDateIcon) ? 'input-group date' : 'date'">
         <input type="text" class="form-control datetimepicker"
-               value.bind="value"
+               value.two-way="value & updateTrigger:'blur'"
                model.bind="model"
                blur.trigger="blur()"
                placeholder.bind="placeholder"
@@ -16,7 +16,7 @@
     <!-- Bootstrap version 4 -->
     <div if.bind="bootstrapVersion == 4" class.bind="parseBool(withDateIcon) ? 'input-group' : 'date'">
         <input type="text" class="form-control date datetimepicker"
-               value.bind="value"
+               value.two-way="value & updateTrigger:'blur'"
                model.bind="model"
                blur.trigger="blur()"
                placeholder.bind="placeholder"
diff --git a/aurelia-bootstrap-datetimepicker/dist/es2015/abp-datetime-picker.js b/aurelia-bootstrap-datetimepicker/dist/es2015/abp-datetime-picker.js
index c8144a73a..00f6a8f32 100644
--- a/aurelia-bootstrap-datetimepicker/dist/es2015/abp-datetime-picker.js
+++ b/aurelia-bootstrap-datetimepicker/dist/es2015/abp-datetime-picker.js
@@ -182,7 +182,7 @@ export let AbpDatetimePickerCustomElement = (_dec = inject(Element), _dec2 = bin
         this.model = moment(value, this._format, true).toDate();
       }
       if (!this.value) {
-        this.value = moment(value, this._format, true);
+        this.value = moment(value, this._format, true).format(this._format);
       }
     }
   }
diff --git a/aurelia-bootstrap-datetimepicker/dist/system/abp-datetime-picker.html b/aurelia-bootstrap-datetimepicker/dist/system/abp-datetime-picker.html
index 11e9ab1d0..fbf289c8a 100644
--- a/aurelia-bootstrap-datetimepicker/dist/system/abp-datetime-picker.html
+++ b/aurelia-bootstrap-datetimepicker/dist/system/abp-datetime-picker.html
@@ -2,7 +2,7 @@
   <!-- Bootstrap version 3 -->
     <div if.bind="bootstrapVersion == 3" class.bind="parseBool(withDateIcon) ? 'input-group date' : 'date'">
         <input type="text" class="form-control datetimepicker"
-               value.bind="value"
+               value.two-way="value & updateTrigger:'blur'"
                model.bind="model"
                blur.trigger="blur()"
                placeholder.bind="placeholder"
@@ -16,7 +16,7 @@
     <!-- Bootstrap version 4 -->
     <div if.bind="bootstrapVersion == 4" class.bind="parseBool(withDateIcon) ? 'input-group' : 'date'">
         <input type="text" class="form-control date datetimepicker"
-               value.bind="value"
+               value.two-way="value & updateTrigger:'blur'"
                model.bind="model"
                blur.trigger="blur()"
                placeholder.bind="placeholder"
diff --git a/aurelia-bootstrap-datetimepicker/dist/system/abp-datetime-picker.js b/aurelia-bootstrap-datetimepicker/dist/system/abp-datetime-picker.js
index 6673eb52f..4f02297c4 100644
--- a/aurelia-bootstrap-datetimepicker/dist/system/abp-datetime-picker.js
+++ b/aurelia-bootstrap-datetimepicker/dist/system/abp-datetime-picker.js
@@ -209,7 +209,7 @@ System.register(['aurelia-framework', 'moment', 'jquery', 'eonasdan-bootstrap-da
               this.model = moment(value, this._format, true).toDate();
             }
             if (!this.value) {
-              this.value = moment(value, this._format, true);
+              this.value = moment(value, this._format, true).format(this._format);
             }
           }
         };
diff --git a/aurelia-bootstrap-datetimepicker/package.json b/aurelia-bootstrap-datetimepicker/package.json
index ab83cfb3a..73d1a8fa0 100644
--- a/aurelia-bootstrap-datetimepicker/package.json
+++ b/aurelia-bootstrap-datetimepicker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-bootstrap-datetimepicker",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "An Aurelia Custom Element for the 3rd party addon [Eonasdan Bootstrap Datepicker]",
   "keywords": [
     "aurelia",