diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index d080d1c22..4db72c5aa 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -169,20 +169,12 @@
 													<option value="{$option->$input.options.id}"
 														{if isset($input.multiple)}
 															{foreach $fields_value[$input.name] as $field_value}
-																{if $field_value == $option->$input.options.id
-																	|| empty($field_value) 
-																	&& isset($input.options.preselect_country)
-																	&& isset($input.options.preselect_country)
-																	&& $option->$input.options.id == $default_country}
+																{if $field_value == $option->$input.options.id}
 																	selected="selected"
 																{/if}
 															{/foreach}
 														{else}
-															{if $fields_value[$input.name] == $option->$input.options.id
-																|| empty($fields_value[$input.name]) 
-																&& isset($input.options.preselect_country)
-																&& isset($input.options.preselect_country)
-																&& $option->$input.options.id == $default_country}
+															{if $fields_value[$input.name] == $option->$input.options.id}
 																selected="selected"
 															{/if}
 														{/if}
@@ -191,20 +183,12 @@
 													<option value="{$option[$input.options.id]}"
 														{if isset($input.multiple)}
 															{foreach $fields_value[$input.name] as $field_value}
-																{if $field_value == $option[$input.options.id]
-																	|| empty($field_value)
-																	&& isset($input.options.preselect_country)
-																	&& isset($input.options.preselect_country)
-																	&& $option[$input.options.id] == $default_country}
+																{if $field_value == $option[$input.options.id]}
 																	selected="selected"
 																{/if}
 															{/foreach}
 														{else}
-															{if $fields_value[$input.name] == $option[$input.options.id]
-																|| empty($fields_value[$input.name])
-																&& isset($input.options.preselect_country)
-																&& isset($input.options.preselect_country)
-																&& $option[$input.options.id] == $default_country}
+															{if $fields_value[$input.name] == $option[$input.options.id]}
 																selected="selected"
 															{/if}
 														{/if}