diff --git a/ghost/admin/app/components/editor/publish-options/publish-at.hbs b/ghost/admin/app/components/editor/publish-options/publish-at.hbs
index 3951188f89..dbad95e48f 100644
--- a/ghost/admin/app/components/editor/publish-options/publish-at.hbs
+++ b/ghost/admin/app/components/editor/publish-options/publish-at.hbs
@@ -17,7 +17,7 @@
             @time={{moment-format (moment-site-tz @publishOptions.scheduledAtUTC) "HH:mm"}}
             @setDate={{this.setDate}}
             @setTime={{this.setTime}}
-            @minDate={{@publishOptions.minScheduledAt}}
+            @minDate={{moment-site-tz @publishOptions.minScheduledAt}}
             @isActive={{@publishOptions.isScheduled}}
             @renderInPlace={{false}}
         />
diff --git a/ghost/admin/app/components/gh-date-time-picker.js b/ghost/admin/app/components/gh-date-time-picker.js
index 1cfdbefaa3..93aa10fa97 100644
--- a/ghost/admin/app/components/gh-date-time-picker.js
+++ b/ghost/admin/app/components/gh-date-time-picker.js
@@ -119,7 +119,7 @@ export default class GhDateTimePicker extends Component {
         }
         this.set('_previousTime', this._time);
 
-        // unless min/max date is at midnight moment will diable that day
+        // unless min/max date is at midnight moment will disable that day
         if (minDate === 'now') {
             this.set('_minDate', moment(moment().format(DATE_FORMAT)));
         } else if (!isBlank(minDate)) {