diff --git a/setup/argparser.sh b/setup/argparser.sh
index 256c74b09..bc851b464 100644
--- a/setup/argparser.sh
+++ b/setup/argparser.sh
@@ -18,7 +18,6 @@ arg_version=""
 arg_web_server_origin=""
 arg_backup_key=""
 arg_aws=""
-arg_timezone=""
 
 args=$(getopt -o "" -l "data:,retire" -n "$0" -- "$@")
 eval set -- "${args}"
@@ -31,8 +30,8 @@ while true; do
         ;;
     --data)
         # only read mandatory non-empty parameters here
-        read -r arg_api_server_origin arg_web_server_origin arg_fqdn arg_token arg_is_custom_domain arg_box_versions_url arg_version arg_timezone <<EOF
-        $(echo "$2" | $json apiServerOrigin webServerOrigin fqdn token isCustomDomain boxVersionsUrl version timezone | tr '\n' ' ')
+        read -r arg_api_server_origin arg_web_server_origin arg_fqdn arg_token arg_is_custom_domain arg_box_versions_url arg_version <<EOF
+        $(echo "$2" | $json apiServerOrigin webServerOrigin fqdn token isCustomDomain boxVersionsUrl version | tr '\n' ' ')
 EOF
         # read possibly empty parameters here
         arg_tls_cert=$(echo "$2" | $json tlsCert)
diff --git a/setup/start.sh b/setup/start.sh
index bfb9d671b..9c90bf07a 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -141,8 +141,7 @@ cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
         "name": "box"
     },
     "backupKey": "${arg_backup_key}",
-    "aws": ${arg_aws},
-    "timezone": "${arg_timezone}"
+    "aws": ${arg_aws}
 }
 CONF_END
 
diff --git a/src/cloudron.js b/src/cloudron.js
index 39fc06692..215e85ff7 100644
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -158,7 +158,7 @@ function activate(username, password, email, name, ip, callback) {
 
     debug('activating user:%s email:%s', username, email);
 
-    setTimeZone(ip, function () { });
+    setTimeZone(ip, function () { }); // TODO: get this from user
 
     if (!name) name = settings.getDefaultSync(settings.CLOUDRON_NAME_KEY);
 
diff --git a/src/config.js b/src/config.js
index 31f6c38b1..7f56bfe3d 100644
--- a/src/config.js
+++ b/src/config.js
@@ -23,8 +23,6 @@ exports = module.exports = {
     isCustomDomain: isCustomDomain,
     database: database,
 
-    defaultTimezone: defaultTimezone,
-
     // these values are derived
     adminOrigin: adminOrigin,
     internalAdminOrigin: internalAdminOrigin,
@@ -85,7 +83,6 @@ function initConfig() {
         secretAccessKey: null   // selfhosting only
     };
     data.dnsInSync = false;
-    data.timezone = 'America/Los_Angeles';
 
     if (exports.CLOUDRON) {
         data.port = 3000;
@@ -205,7 +202,3 @@ function backupKey() {
 function aws() {
     return get('aws');
 }
-
-function defaultTimezone() {
-    return get('timezone');
-}
\ No newline at end of file
diff --git a/src/settings.js b/src/settings.js
index a5d0e8474..46dc9194f 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -44,7 +44,7 @@ var assert = require('assert'),
 var gDefaults = (function () {
     var result = { };
     result[exports.AUTOUPDATE_PATTERN_KEY] = '00 00 1,3,5,23 * * *';
-    result[exports.TIME_ZONE_KEY] = config.defaultTimezone();
+    result[exports.TIME_ZONE_KEY] = 'America/Los_Angeles';
     result[exports.CLOUDRON_NAME_KEY] = 'Cloudron';
     result[exports.DEVELOPER_MODE_KEY] = false;