diff --git a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
index 7ff21572c..79dbf64f1 100644
--- a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
+++ b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl
@@ -53,9 +53,9 @@
 					{if $module->active}
 						<td style="text-align: center">
 							{if !$item['check_list'][$key_module]}
-								--
+								{$type = null}
 							{elseif $list['name_id'] === 'currency'}
-								{if $module->currencies && $module->currencies_mode == 'checkbox'}				
+								{if $module->currencies && $module->currencies_mode == 'checkbox'}
 									{$type = 'checkbox'}
 								{elseif $module->currencies && $module->currencies_mode == 'radio'}
 									{$type = 'radio'}
@@ -63,7 +63,7 @@
 							{else}
 								{$type = 'checkbox'}
 							{/if}
-							{if isset($type)}
+							{if $type != null}
 								<input type="checkbox" name="{$module->name}_{$list['name_id']}[]" value="{$item[$list['identifier']]}"
 									{if $item['check_list'][$key_module] == 'checked'}checked="checked"{/if} 
 								/>
diff --git a/controllers/admin/AdminPaymentController.php b/controllers/admin/AdminPaymentController.php
index eab98a7e9..70395b6bd 100644
--- a/controllers/admin/AdminPaymentController.php
+++ b/controllers/admin/AdminPaymentController.php
@@ -181,7 +181,7 @@ class AdminPaymentControllerCore extends AdminController
 						&& isset($module->limited_countries)
 						&& !empty($module->limited_countries)
 						&& !(in_array(strtoupper($item['iso_code']), array_map('strtoupper', $module->limited_countries))))
-						$list['check_list'][$key_module] = null;
+						$list['items'][$key_item]['check_list'][$key_module] = null;
 				}
 			}
 			// update list