diff --git a/public_html/deployment/classes/formgen.class.php b/public_html/deployment/classes/formgen.class.php
index 7ca0a12b2389eeddd55be692fea0c535580cc843..0e1ea574d1ed829579ef5bc0d279687aab368dc9 100644
--- a/public_html/deployment/classes/formgen.class.php
+++ b/public_html/deployment/classes/formgen.class.php
@@ -164,7 +164,7 @@ class formgen {
                     $sFormElement.="\n".'<div class="checkbox">';
                     $s = preg_replace('/\W/iu', '', $sId . $idOption);
                     $sOptionId = preg_replace('/[äöüß]/i', '', $s);
-                    $sFormElement.='    <input type="checkbox" id="' . $sOptionId . '" value="' . $idOption . '" ';
+                    $sFormElement.='    <input type="checkbox" id="' . $sOptionId . '" value="' . (isset($aOptionData["value"]) ? $aOptionData["value"] : $idOption) . '" ';
                     $sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes,checked"), $aOptionData);
                     $sFormElement.=' name="' . $elementData["name"] . '[]"';
                     $sFormElement.='/><label for="' . $sOptionId . '">' . $aOptionData["label"] . '</label></div>';
@@ -200,7 +200,7 @@ class formgen {
                     $sFormElement.="\n".'<div class="radio">';
                     $s = preg_replace('/\W/iu', '', $sId . $idOption);
                     $sOptionId = preg_replace('/[äöüß]/i', '', $s);
-                    $sFormElement.='    <input type="radio" id="' . $sOptionId . '" value="' . $idOption . '" ';
+                    $sFormElement.='    <input type="radio" id="' . $sOptionId . '" value="' . (isset($aOptionData["value"]) ? $aOptionData["value"] : $idOption) . '" ';
                     $sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes,checked,disabled"), $aOptionData);
                     $sFormElement.=" " . $this->_addHtmlAtrributes(explode(",", "name"), $elementData);
                     $sFormElement.='/><label for="' . $sOptionId . '">' . $aOptionData["label"] . '</label></div>';
@@ -231,7 +231,7 @@ class formgen {
                 foreach ($elementData["options"] as $idOption => $aOptionData) {
                     $s = preg_replace('/\W/iu', '', $sId . $idOption);
                     $sOptionId = preg_replace('/[äöüß]/i', '', $s);
-                    $sFormElement.='    <option value="' . $idOption . '" ';
+                    $sFormElement.='    <option value="' . (isset($aOptionData["value"]) ? $aOptionData["value"] : $idOption) . '" ';
                     $sFormElement.=$this->_addHtmlAtrributes(explode(",", "$sDefaultAttributes,selected"), $aOptionData);
                     $sFormElement.='>' . $aOptionData["label"] . '</option>' . "\n";
                 }