diff --git a/admin-dev/themes/default/template/helper/options/options.tpl b/admin-dev/themes/default/template/helper/options/options.tpl
index 432a47fb6..3e64c9238 100644
--- a/admin-dev/themes/default/template/helper/options/options.tpl
+++ b/admin-dev/themes/default/template/helper/options/options.tpl
@@ -183,7 +183,7 @@
 						</label>
 					</div>
 				{/if}
-				{if (isset($field['required']) && $field['required'])}
+				{if isset($field['required']) && $field['required'] && $field['type'] != 'radio'}
 					<sup>*</sup>
 				{/if}
 				{if isset($field['desc'])}<p class="preference_description">{$field['desc']}</p>{/if}
@@ -202,7 +202,7 @@
 				/>
 			</div>
 		{/if}
-		{if $required_fields}
+		{if isset($categoryData['required_fields']) && $categoryData['required_fields']}
 			<div class="small"><sup>*</sup> {l s='Required field'}</div>
 		{/if}
 		{if isset($categoryData['bottom'])}{$categoryData['bottom']}{/if}
diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php
index f0085a7bb..7df20413a 100644
--- a/classes/helper/HelperOptions.php
+++ b/classes/helper/HelperOptions.php
@@ -133,8 +133,7 @@ class HelperOptionsCore extends Helper
 
 				// Is at least one required field present?
 				if (isset($field['required']) && $field['required'])
-					$required_fields = true;
-
+					$category_data['required_fields'] = true;
 			}
 			// Assign the modifications back to parent array
 			$option_list[$category] = $category_data;
@@ -150,7 +149,6 @@ class HelperOptionsCore extends Helper
 			'token' => $this->token,
 			'option_list' => $option_list,
 			'current_id_lang' => $this->context->language->id,
-			'required_fields' => isset($required_fields) ? $required_fields : false,
 			'languages' => isset($languages) ? $languages : null,
 			'currency_left_sign' => $this->context->currency->getSign('left'),
 			'currency_right_sign' => $this->context->currency->getSign('right'),