diff --git a/application/controllers/api/v1/codex/Zgvmaster.php b/application/controllers/api/v1/codex/Zgvmaster.php
index ff737dd7f..7775724c2 100644
--- a/application/controllers/api/v1/codex/Zgvmaster.php
+++ b/application/controllers/api/v1/codex/Zgvmaster.php
@@ -45,6 +45,14 @@ class Zgvmaster extends API_Controller
 		}
 	}
 
+	/**
+	 * @return zgvmaster
+	 */
+	public function getAllZgvmaster()
+	{
+		$this->response($this->Zgvmaster_model->getAllZgvmaster(), REST_Controller::HTTP_OK);
+	}
+
 	/**
 	 * @return void
 	 */
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 71fbe2bf8..9d6da7ae8 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -160,6 +160,7 @@ class InfoCenter extends Auth_Controller
 		$this->load->model('system/Filters_model', 'FiltersModel');
 		$this->load->model('system/PersonLock_model', 'PersonLockModel');
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
+		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
 		$this->load->model('codex/Nation_model', 'NationModel');
 
 		// Loads libraries
diff --git a/application/models/codex/Zgvmaster_model.php b/application/models/codex/Zgvmaster_model.php
index 38f8a0dcb..0f6305532 100644
--- a/application/models/codex/Zgvmaster_model.php
+++ b/application/models/codex/Zgvmaster_model.php
@@ -11,4 +11,14 @@ class Zgvmaster_model extends DB_Model
 		$this->dbTable = 'bis.tbl_zgvmaster';
 		$this->pk = 'zgvmas_code';
 	}
+
+	/**
+	 * getAllForStyled Dropdown
+	 */
+	public function getAllZgvmaster()
+	{
+		$allZgvMaster = 'SELECT * FROM bis.tbl_zgvmaster ORDER BY zgvmas_bez ASC;';
+
+		return $this->execQuery($allZgvMaster);
+	}
 }
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 93742e51c..7d2b10790 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -197,8 +197,7 @@
 										</div>
 									</div>
 									<?php if (!$infoonly)
-
-										//dropdown als Werte vom ZgvModel, um nicht aktive Werte als disabled anzuzeigen
+										//dropdown als Werte vom ZgvModel, um nicht aktive Werte mit Zusatz anzuzeigen
 										$alleZGV = $this->ZgvModel->getAllZgv();
                    	echo '<select id= "zgv_'.$zgvpruefung->prestudent_id.'" name="zgv">';
                    	 $zgvpruefung->zgv_bez != '' ? $default = "selected" : $default = "";
@@ -212,7 +211,6 @@
                            	echo '<option '. $selected.' value= "'.$zgv->zgv_code.'">'.$zgv->zgv_bez. $zusatz .'</option>';
                    	endforeach;
                    	echo "</select>";
-
                    	?>
 								</div>
 							</div>
@@ -250,8 +248,7 @@
 									<label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('person', 'nation') . ':'?></label>
 
 									<?php if (!$infoonly)
-
-										//dropdown als Werte vom NationModel, um nicht aktive Werte als disabled anzuzeigen
+										//dropdown als Werte vom NationModel, um nicht aktive Werte  mit Zusatz anzuzeigen
 										$allNations = $this->NationModel->getAll();
 										echo '<select id= "zgvnation_'.$zgvpruefung->prestudent_id.'" name="zgvnation">';
 										$zgvpruefung->nation_code != '' ? $default = "selected" : $default = "";
@@ -273,15 +270,23 @@
 							<div class="row">
 								<div class="col-lg-<?php echo $columns[0] ?>">
 									<div class="form-group"><label><?php echo  $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre','master') . ':'?></label>
-										<?php
-										if ($infoonly)
-											echo $zgvpruefung->zgvmas_bez;
-										else
-											echo $this->widgetlib->widget(
-												'Zgvmaster_widget',
-												array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmas_code),
-												array('name' => 'zgvmas', 'id' => 'zgvmas_'.$zgvpruefung->prestudent_id)
-											); ?>
+
+											<?php if (!$infoonly)
+												//dropdown als Werte vom ZgvmasterModel, um nicht aktive Werte mit Zusatz anzuzeigen
+												$alleZGVmaster = $this->ZgvmasterModel->getAllZgvmaster();
+												echo '<select id= "zgvmas_'.$zgvpruefung->prestudent_id.'" name="zgvmas">';
+												 $zgvpruefung->zgvmas_bez != '' ? $default = "selected" : $default = "";
+
+												echo '<option '. $default.' value = "null">--Bitte Eintrag wählen--</option>';
+
+												foreach ($alleZGVmaster->retval as $zgvmaster):
+																//zusatz
+																$zgvmaster->aktiv == 'true' ? $zusatz = '' : $zusatz = ' --- nicht (länger) aktiv ---';
+																$zgvmaster->zgvmas_code == $zgvpruefung->zgvmas_code ? $selected = "selected" : $selected = "";
+																echo '<option '. $selected.' value= "'.$zgvmaster->zgvmas_code.'">'.$zgvmaster->zgvmas_bez. $zusatz .'</option>';
+												endforeach;
+												echo "</select>";
+												?>
 									</div>
 								</div>
 								<div class="col-lg-<?php echo $columns[1] ?>">
@@ -317,15 +322,25 @@
 								</div>
 								<div class="col-lg-<?php echo $columns[3] ?>">
 									<div class="form-group"><label><?php echo $this->p->t('infocenter', 'zgv') . ' ' . $this->p->t('lehre', 'master') . ' ' . $this->p->t('person', 'nation') . ':'?></label>
-										<?php
-										if ($infoonly)
-											echo $zgvpruefung->zgvmanation_bez;
-										else
-											echo $this->widgetlib->widget(
-												'Nation_widget',
-												array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvmanation_code),
-												array('name' => 'zgvmanation', 'id' => 'zgvmanation_'.$zgvpruefung->prestudent_id)
-											); ?>
+
+											<?php if (!$infoonly)
+												//dropdown als Werte vom NationModel, um nicht aktive Werte  mit Zusatz anzuzeigen
+												$allNations = $this->NationModel->getAll();
+												echo '<select id= "zgvmanation_'.$zgvpruefung->prestudent_id.'" name="zgvmanation">';
+
+												$zgvpruefung->zgvmanation_code != '' ? $default = "selected" : $default = "";
+												echo '<option '. $default.' value = "null">--Bitte Eintrag wählen--</option>';
+												foreach ($allNations->retval as $nation):
+																//zusatz
+																$nation->sperre != 'true' ? $zusatz = ' ' : $zusatz = ' --- Nation/Staat nicht existent ---';
+
+																$nation->nation_code == $zgvpruefung->zgvmanation_code ? $selected = "selected" : $selected = "";
+																echo '<option '. $selected.' value= "'.$nation->nation_code.'">'. $nation->langtext . $zusatz.'</option>';
+												endforeach;
+												echo "</select>";
+												?>
+
+
 									</div>
 								</div>
 							</div>