diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
index 913e54dd8fc..c6664d512dc 100644
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@ -25,7 +25,7 @@ OC_UTIL::addStyle('', 'jquery.multiselect');
 				if ($continent!="") echo '</optgroup>';
 				echo '<optgroup label="'.$ex[0].'">';
 			endif;
-			$city=$ex[1];
+			$city=strtr($ex[1], '_', ' ');
 			$continent=$ex[0];
 			echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
                 endforeach;?>