diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index f354bbbe0..2df20ecf4 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -1727,9 +1727,11 @@ this.$el.one('dispose-control',this.proxy(this.dispose))}
DateTimeConverter.prototype.initDefaults=function(){if(!this.options.timezone){this.options.timezone=$('meta[name="backend-timezone"]').attr('content')}
if(!this.options.locale){this.options.locale=$('meta[name="backend-locale"]').attr('content')}
if(!this.options.format){this.options.format='llll'}
-if(this.options.formatAlias){this.options.format=this.getFormatFromAlias(this.options.formatAlias)}}
+if(this.options.formatAlias){this.options.format=this.getFormatFromAlias(this.options.formatAlias)}
+this.appTimezone=$('meta[name="app-timezone"]').attr('content')
+if(!this.appTimezone){this.appTimezone='UTC'}}
DateTimeConverter.prototype.getDateTimeValue=function(){this.datetime=this.$el.attr('datetime')
-var momentObj=moment(this.datetime),result
+var momentObj=moment.tz(this.datetime,this.appTimezone),result
if(this.options.locale){moment.locale(this.options.locale)}
if(this.options.timezone){momentObj=momentObj.tz(this.options.timezone)}
if(this.options.timeSince){result=momentObj.fromNow()}
diff --git a/modules/backend/assets/js/october.datetime.js b/modules/backend/assets/js/october.datetime.js
index 0bf33b976..5437ad9d8 100644
--- a/modules/backend/assets/js/october.datetime.js
+++ b/modules/backend/assets/js/october.datetime.js
@@ -67,11 +67,17 @@
if (this.options.formatAlias) {
this.options.format = this.getFormatFromAlias(this.options.formatAlias)
}
+
+ this.appTimezone = $('meta[name="app-timezone"]').attr('content')
+ if (!this.appTimezone) {
+ this.appTimezone = 'UTC'
+ }
}
DateTimeConverter.prototype.getDateTimeValue = function() {
this.datetime = this.$el.attr('datetime')
- var momentObj = moment(this.datetime),
+
+ var momentObj = moment.tz(this.datetime, this.appTimezone),
result
if (this.options.locale) {
diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index c2be8adcf..88894c624 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -1,6 +1,7 @@
+