diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index f4fc16ab52..35794f8533 100644
--- a/phpBB/phpbb/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
@@ -268,9 +268,16 @@ class manager
 	{
 		$config_name = $driver->get_config_name();
 
-		return array(
-			'allow_avatar_' . $config_name	=> array('lang' => 'ALLOW_' . strtoupper(str_replace('\\', '_', $config_name)),		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-		);
+		return [
+			'allow_avatar_' . $config_name	=> [
+				'lang' => 'ALLOW_' . strtoupper(str_replace('\\', '_', $config_name)),
+				'validate' => 'bool',
+				'type' => 'radio',
+				'function' => 'build_radio',
+				'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'YES', 0 => 'NO']],
+				'explain' => true
+			],
+		];
 	}
 
 	/**
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 19b7797eb4..fe8a498064 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -191,9 +191,16 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
 	{
 		$avatar_settings = $this->manager->get_avatar_settings($this->avatar_foobar);
 
-		$expected_settings = array(
-			'allow_avatar_' . get_class($this->avatar_foobar)	=> array('lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)), 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
-		);
+		$expected_settings = [
+			'allow_avatar_' . get_class($this->avatar_foobar)	=> [
+				'lang' => 'ALLOW_' . strtoupper(get_class($this->avatar_foobar)),
+				'validate' => 'bool',
+				'type' => 'radio',
+				'function' => 'build_radio',
+				'params' => ['{CONFIG_VALUE}', '{KEY}', [1 => 'YES', 0 => 'NO']],
+				'explain' => true
+			],
+		];
 
 		$this->assertEquals($expected_settings, $avatar_settings);
 	}