diff --git a/modules/system.module b/modules/system.module
index 170fd8090ca7bd70970a2f2412b4a066444709df..10199e0751492208888fcf5f16eba87441a2361d 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -106,7 +106,7 @@ function system_user($type, $edit, &$user, $category = NULL) {
 
     if (variable_get('configurable_timezones', 1)) {
       $zones = _system_zonelist();
-      $data[] = array('title' => t('Locale settings'), 'data' => form_select(t('Time zone'), 'timezone', $edit['timezone'], $zones, t('Select what time you currently have and your time zone settings will be set appropriately.')), 'weight' => 2);
+      $data[] = array('title' => t('Locale settings'), 'data' => form_select(t('Time zone'), 'timezone', isset($edit['timezone']) ? $edit['timezone'] : variable_get('date_default_timezone', 0), $zones, t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.')), 'weight' => 2);
     }
     return $data;
   }
diff --git a/modules/system/system.module b/modules/system/system.module
index 170fd8090ca7bd70970a2f2412b4a066444709df..10199e0751492208888fcf5f16eba87441a2361d 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -106,7 +106,7 @@ function system_user($type, $edit, &$user, $category = NULL) {
 
     if (variable_get('configurable_timezones', 1)) {
       $zones = _system_zonelist();
-      $data[] = array('title' => t('Locale settings'), 'data' => form_select(t('Time zone'), 'timezone', $edit['timezone'], $zones, t('Select what time you currently have and your time zone settings will be set appropriately.')), 'weight' => 2);
+      $data[] = array('title' => t('Locale settings'), 'data' => form_select(t('Time zone'), 'timezone', isset($edit['timezone']) ? $edit['timezone'] : variable_get('date_default_timezone', 0), $zones, t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.')), 'weight' => 2);
     }
     return $data;
   }