Give empty timezone a name

frontend/src/admin/settings/components/SettingsSetting.jsx

@@ -49,8 +49,8 @@ export default class SettingsSetting extends Component {
                 value={setting.value}
                 options={setting.options}
                 onChange={this.props.updateSetting.bind(null, setting)}
-                optionNameFn={option => option}
-                optionValueFn={option => option}
+                optionNameFn={option => typeof option === "object" ? option.name : option }
+                optionValueFn={option => typeof option === "object" ? option.value : option }
             />
         );
     }

frontend/src/admin/settings/settings.controllers.js

@@ -8,7 +8,7 @@ var SettingsAdminControllers = angular.module('metabaseadmin.settings.controller
 
 // from common.clj
 var TIMEZONES = [
-    "",
+    { name: "Database Default", value: "" },
     "GMT",
     "UTC",
     "US/Alaska",