diff --git a/src/Frozennode/Administrator/Fields/Enum.php b/src/Frozennode/Administrator/Fields/Enum.php
index e176ac4b3..b310e1ace 100644
--- a/src/Frozennode/Administrator/Fields/Enum.php
+++ b/src/Frozennode/Administrator/Fields/Enum.php
@@ -30,7 +30,7 @@ public function build()
 		foreach ($dataOptions as $val => $text)
 		{
 			$options['options'][] = array(
-				'id' => is_numeric($val) ? $text : $val,
+				'id' => is_numeric($val) && (!array_key_exists('enum_numeric_keys', $options) || $options['enum_numeric_keys'] == false) ? $text : $val,
 				'text' => $text,
 			);
 		}