diff --git a/src/js/admin-general-view.js b/src/js/admin-general-view.js
index 62264b3..ad662e6 100644
--- a/src/js/admin-general-view.js
+++ b/src/js/admin-general-view.js
@@ -45,8 +45,8 @@ module.exports = {
       time_zones: [],
       is_loading_time: false,
       selected_date: null,
-      selected_hours: this.current_time == null ? "00" : this.current_time.getHours(),
-      selected_minutes: this.current_time == null ? "00" : this.current_time.getMinutes(),
+      selected_hours: "",
+      selected_minutes: "",
       selected_meridiem: "AM",
     };
   },
@@ -105,6 +105,7 @@ module.exports = {
 
           if (time_zone) {
             this.current_timezone = time_zone[1];
+            this.selected_timezone = time_zone[1];
           }
         }
       } catch (error) {
diff --git a/src/pug/templates/admin-general-view.pug b/src/pug/templates/admin-general-view.pug
index 49e8926..8c77061 100644
--- a/src/pug/templates/admin-general-view.pug
+++ b/src/pug/templates/admin-general-view.pug
@@ -111,7 +111,7 @@ script#admin-general-view-template(type="text/x-template")
         required
       )
       
-      select(:disabled="config.admin.time_format" v-model="selected_meridiem" style="width:65px")
+      select(:disabled="config.admin.time_format" v-model="selected_meridiem" style="width:68px")
         option(value="AM" selected) AM
         option(value="PM") PM
 
diff --git a/src/py/bbctrl/Web.py b/src/py/bbctrl/Web.py
index 2b5dcf9..ef25b13 100644
--- a/src/py/bbctrl/Web.py
+++ b/src/py/bbctrl/Web.py
@@ -576,8 +576,8 @@ class TimeHandler(bbctrl.APIHandler):
         self.write_json({'timeinfo': timeinfo, 'timezones': timezones})
 
     def put_ok(self):
-        datetime = self.json['datetime']
-        timezone = self.json['timezone']
+        datetime = self.json.get('datetime', None)
+        timezone = self.json.get('timezone', None)
 
         try:
             if datetime is not None: