diff --git a/include/firma.class.php b/include/firma.class.php
index 029e1469a..0e98a3738 100644
--- a/include/firma.class.php
+++ b/include/firma.class.php
@@ -177,7 +177,7 @@ class firma extends basis_db
 			//Neuen Datensatz einfuegen
 			$qry='INSERT INTO public.tbl_firma (name,  anmerkung, lieferbedingungen,
 					firmentyp_kurzbz, updateamum, updatevon, insertamum, insertvon, schule,steuernummer,
-					gesperrt,aktiv,finanzamt) VALUES('.
+					gesperrt,aktiv,finanzamt, partner_code) VALUES('.
 				$this->db_add_param($this->name).', '.
 				$this->db_add_param($this->anmerkung).', '.
 				$this->db_add_param($this->lieferbedingungen).', '.
@@ -388,7 +388,7 @@ class firma extends basis_db
 				UNION
 				SELECT
 					firma_id, name, anmerkung, lieferbedingungen, firmentyp_kurzbz, updateamum, updatevon, insertamum, insertvon,
-					ext_id, schule, steuernummer, gesperrt, aktiv, finanzamt, '2' as sort
+					ext_id, schule, steuernummer, gesperrt, aktiv, finanzamt, '2' as sort, partner_code
 				FROM public.tbl_firma
 				WHERE
 				UPPER(trim(public.tbl_firma.name)) like '%".$this->db_escape($matchcode)."%'
@@ -698,7 +698,7 @@ class firma extends basis_db
 
 		if($firmentyp_kurzbz!='')
 			$qry.=" and firmentyp_kurzbz=".$this->db_add_param($firmentyp_kurzbz);
-		
+
 		if($oes!='')
 			$qry.=" and oe_kurzbz IN ('".$oes."') ";
 
diff --git a/vilesci/personen/leistungsstipendium.php b/vilesci/personen/leistungsstipendium.php
index a63427ebb..4b1d02fc1 100755
--- a/vilesci/personen/leistungsstipendium.php
+++ b/vilesci/personen/leistungsstipendium.php
@@ -46,6 +46,12 @@ if ($studiensemester->getAll("desc") === false)
 	die("Error: " . $studiensemester->errormsg);
 }
 
+// Gets current studiensemester
+if (($currentStudiensemester = $studiensemester->getakt()) === false)
+{
+	die("Error: " . $studiensemester->errormsg);
+}
+
 // Gets all activ studiengang
 $studiengang = new studiengang();
 if ($studiengang->getAll("kurzbzlang", true) === false)
@@ -217,6 +223,12 @@ if (!$errorOccurred && $dataPosted)
 	$student = new student(); // Object that represents a student
 	$fileRow = false; // Contains a single file row
 	$lineNumber = 0; // lines number counter
+	
+	// Gets the previous studiensemester to the posted one
+	if (($previousStudiensemester = $studiensemester->getPreviousFrom($postStudiensemester)) === false)
+	{
+		die("Error: " . $studiensemester->errormsg);
+	}
 
 	// Loops on file rows
 	do
@@ -250,8 +262,10 @@ if (!$errorOccurred && $dataPosted)
 							$uid = $rowCode;
 							$student->errormsg = ""; // Clean errors messages
 						}
-						// Looking for a person by uid that is valid for that studiensemester
-						if ($student->load($uid, $postStudiensemester) === true)
+						// Looking for a person by uid that is valid for the posted studiensemester
+						// or for the previous one
+						if ($student->load($uid, $postStudiensemester) === true
+						 || $student->load($uid, $previousStudiensemester) === true)
 						{
 							// If the student is valid for that studiengang
 							// and checks if the studiengang present in the file is
@@ -379,10 +393,21 @@ if (!$errorOccurred && $dataPosted)
 					<td>
 						<select name="studiensemester">
 						<?php
+							$selected = "";
 							// Fills the select element with all the loaded studiensemester
 							foreach($studiensemester->studiensemester as $val)
 							{
-								echo sprintf("<option value=\"%s\">%s</option>", $val->studiensemester_kurzbz, $val->studiensemester_kurzbz);
+								// If it is the current studiensemester then selects it
+								if ($val->studiensemester_kurzbz == $currentStudiensemester)
+								{
+									$selected = "selected";
+								}
+								else
+								{
+									$selected = "";
+								}
+								
+								echo sprintf("<option value=\"%s\" %s>%s</option>", $val->studiensemester_kurzbz, $selected, $val->studiensemester_kurzbz);
 							}
 						?>
 						</select>