diff --git a/program/localization/en_US/timezones.inc b/program/localization/en_US/timezones.inc
index f4906848f..9ff3cc255 100644
--- a/program/localization/en_US/timezones.inc
+++ b/program/localization/en_US/timezones.inc
@@ -77,6 +77,18 @@ $labels['tz:america:anguilla'] = 'Anguilla';
 $labels['tz:america:antigua'] = 'Antigua';
 $labels['tz:america:araguaina'] = 'Araguaina';
 $labels['tz:america:argentina'] = 'Argentina';
+$labels['tz:america:argentina:buenos_aires'] = 'Buenos Aires';
+$labels['tz:america:argentina:catamarca'] = 'Catamarca';
+$labels['tz:america:argentina:cordoba'] = 'Cordoba';
+$labels['tz:america:argentina:jujuy'] = 'Jujuy';
+$labels['tz:america:argentina:la_rioja'] = 'La Rioja';
+$labels['tz:america:argentina:mendoza'] = 'Mendoza';
+$labels['tz:america:argentina:rio_gallegos'] = 'Rio Gallegos';
+$labels['tz:america:argentina:salta'] = 'Salta';
+$labels['tz:america:argentina:san_juan'] = 'San Juan';
+$labels['tz:america:argentina:san_luis'] = 'San Luis';
+$labels['tz:america:argentina:tucuman'] = 'Tucuman';
+$labels['tz:america:argentina:ushuaia'] = 'Ushuaia';
 $labels['tz:america:aruba'] = 'Aruba';
 $labels['tz:america:asuncion'] = 'Asunción';
 $labels['tz:america:atikokan'] = 'Atikokan';
@@ -125,11 +137,21 @@ $labels['tz:america:halifax'] = 'Halifax';
 $labels['tz:america:havana'] = 'Havana';
 $labels['tz:america:hermosillo'] = 'Hermosillo';
 $labels['tz:america:indiana'] = 'Indiana';
+$labels['tz:america:indiana:indianapolis'] = 'Indianapolis';
+$labels['tz:america:indiana:knox'] = 'Knox';
+$labels['tz:america:indiana:marengo'] = 'Marengo';
+$labels['tz:america:indiana:petersburg'] = 'Petersburg';
+$labels['tz:america:indiana:tell_city'] = 'Tell City';
+$labels['tz:america:indiana:vevay'] = 'Vevay';
+$labels['tz:america:indiana:vincennes'] = 'Vincennes';
+$labels['tz:america:indiana:winamac'] = 'Winamac';
 $labels['tz:america:inuvik'] = 'Inuvik';
 $labels['tz:america:iqaluit'] = 'Iqaluit';
 $labels['tz:america:jamaica'] = 'Jamaica';
 $labels['tz:america:juneau'] = 'Juneau';
 $labels['tz:america:kentucky'] = 'Kentucky';
+$labels['tz:america:kentucky:louisville'] = 'Louisville';
+$labels['tz:america:kentucky:monticello'] = 'Monticello';
 $labels['tz:america:kralendijk'] = 'Kralendijk';
 $labels['tz:america:la_paz'] = 'La Paz';
 $labels['tz:america:lima'] = 'Lima';
@@ -157,6 +179,9 @@ $labels['tz:america:nipigon'] = 'Nipigon';
 $labels['tz:america:nome'] = 'Nome';
 $labels['tz:america:noronha'] = 'Noronha';
 $labels['tz:america:north_dakota'] = 'North Dakota';
+$labels['tz:america:north_dakota:beulah'] = 'Beulah';
+$labels['tz:america:north_dakota:center'] = 'Center';
+$labels['tz:america:north_dakota:new_salem'] = 'New Salem';
 $labels['tz:america:ojinaga'] = 'Ojinaga';
 $labels['tz:america:panama'] = 'Panama';
 $labels['tz:america:pangnirtung'] = 'Pangnirtung';
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index bb07e61bd..3f01f6c44 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -1445,17 +1445,16 @@ function rcmail_timezone_label($tz)
         return str_replace('_', ' ', $tz);
     }
 
-    list($glob, $city) = explode('/', $tz);
+    $tokens = explode('/', $tz);
+    $key    = 'tz';
 
-    $glob_idx   = 'tz:' . strtolower($glob);
-    $city_idx   = 'tz:' . strtolower($glob) . ':' . strtolower($city);
-    $glob_label = $labels[$glob_idx] ?: $glob;
-    $city_label = $labels[$city_idx] ?: str_replace('_', ' ', $city);
+    foreach ($tokens as $i => $token) {
+        $idx   = strtolower($token);
+        $token = str_replace('_', ' ', $token);
+        $key  .= ":$idx";
 
-    $label = $glob_label;
-    if ($city) {
-        $label .= '/' . $city_label;
+        $tokens[$i] = $labels[$key] ?: $token;
     }
 
-    return $label;
+    return implode('/', $tokens);
 }