diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index c18bec7035..a4f7455b01 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -438,7 +438,10 @@ phpbb.timezone_switch_date = function(keep_selection) {
 	}
 
 	if (typeof keep_selection !== 'undefined' && !keep_selection) {
-		$('#timezone > option:first').attr('selected', true);
+		var timezoneOptions = $('#timezone > optgroup option');
+		if (timezoneOptions.filter(':selected').length <= 0) {
+			timezoneOptions.filter(':first').attr('selected', true);
+		}
 	}
 }
 
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index 47537e9d8b..db95e5ba13 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -104,7 +104,4 @@
 </div>
 </form>
 
-<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/timezone.js"></script>
-<script type="text/javascript">phpbb_preselect_tz_select();</script>
-
 <!-- INCLUDE overall_footer.html -->