diff --git a/application/controllers/system/Phrases.php b/application/controllers/system/Phrases.php
index e87859ea7..46d3add59 100644
--- a/application/controllers/system/Phrases.php
+++ b/application/controllers/system/Phrases.php
@@ -8,6 +8,9 @@ class Phrases extends FHC_Controller
     {
         parent::__construct();
         $this->load->library('PhrasesLib');
+        
+        // Loads helper message to manage returning messages
+		$this->load->helper('message');
     }
 
 	public function index()
@@ -105,20 +108,39 @@ class Phrases extends FHC_Controller
 	public function newText()
 	{
 		$phrase_id = $this->input->post('phrase_id');
-		$data = array
-		(
-			'phrase_id' => $phrase_id,
-			'sprache' => 'German',
-			'text' => '',
-			'description' => '',
-			'orgeinheit_kurzbz' => 'etw'
-		);
-		$phrase_inhalt = $this->phraseslib->insertPhraseinhalt($data);
-		if ($phrase_inhalt->error)
-			show_error($phrase_inhalt->retval);
-		$phrase_inhalt_id = $phrase_inhalt->retval;
-
-		redirect('/system/Phrases/editText/'.$phrase_inhalt_id);
+		
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->OrganisationseinheitModel->addLimit(1);
+		$this->OrganisationseinheitModel->addOrder('oe_kurzbz');
+		$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
+		
+		if ($resultOE->error)
+			show_error($resultOE->retval);
+		
+		if (hasData($resultOE))
+		{
+			$orgeinheit_kurzbz = $resultOE->retval[0]->oe_kurzbz;
+			
+			$data = array (
+				'phrase_id' => $phrase_id,
+				'sprache' => 'German',
+				'text' => '',
+				'description' => '',
+				'orgeinheit_kurzbz' => $orgeinheit_kurzbz
+			);
+			
+			$phrase_inhalt = $this->phraseslib->insertPhraseinhalt($data);
+			if ($phrase_inhalt->error)
+				show_error($phrase_inhalt->retval);
+			
+			$phrase_inhalt_id = $phrase_inhalt->retval;
+			
+			redirect('/system/Phrases/editText/'.$phrase_inhalt_id);
+		}
+		else
+		{
+			show_error('No valid organisation unit found');
+		}
 	}
 
 	public function editText($phrasentext_id)
diff --git a/application/controllers/system/Templates.php b/application/controllers/system/Templates.php
index 16667c960..e33eed087 100755
--- a/application/controllers/system/Templates.php
+++ b/application/controllers/system/Templates.php
@@ -98,20 +98,39 @@ class Templates extends FHC_Controller
 
 	public function newText()
 	{
-		$vorlage_kurzbz = $this->input->post('vorlage_kurzbz', TRUE);
-		$data = array
-		(
-			'vorlage_kurzbz' => $vorlage_kurzbz,
-			'studiengang_kz' => 0,
-			'version' => 1,
-			'oe_kurzbz' => 'etw'
-		);
-		$vorlagetext = $this->vorlagelib->insertVorlagetext($data);
-		if ($vorlagetext->error)
-			show_error($vorlagetext->retval);
-		$vorlagestudiengang_id = $vorlagetext->retval;
-
-		redirect('/system/Templates/editText/'.$vorlagestudiengang_id);
+		$vorlage_kurzbz = $this->input->post('vorlage_kurzbz', true);
+		
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->OrganisationseinheitModel->addLimit(1);
+		$this->OrganisationseinheitModel->addOrder('oe_kurzbz');
+		$resultOE = $this->OrganisationseinheitModel->loadWhere(array('aktiv' => true, 'oe_parent_kurzbz' => null));
+		
+		if ($resultOE->error)
+			show_error($resultOE->retval);
+		
+		if (hasData($resultOE))
+		{
+			$orgeinheit_kurzbz = $resultOE->retval[0]->oe_kurzbz;
+			
+			$data = array (
+				'vorlage_kurzbz' => $vorlage_kurzbz,
+				'studiengang_kz' => 0,
+				'version' => 1,
+				'oe_kurzbz' => $orgeinheit_kurzbz
+			);
+			
+			$vorlagetext = $this->vorlagelib->insertVorlagetext($data);
+			if ($vorlagetext->error)
+				show_error($vorlagetext->retval);
+			
+			$vorlagestudiengang_id = $vorlagetext->retval;
+			
+			redirect('/system/Templates/editText/'.$vorlagestudiengang_id);
+		}
+		else
+		{
+			show_error('No valid organisation unit found');
+		}
 	}
 
 	public function editText($vorlagestudiengang_id)