diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 89941aeb1..e06965bea 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -547,6 +547,7 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(
@@ -585,6 +586,8 @@ class Studiengang_model extends DB_Model
 			$this->db->group_end();
 		}
 
+		$this->addOrder('name');
+
 		return $this->load();
 	}
 }
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index 490e62548..6169fef72 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -22,15 +22,6 @@ export default {
 	computed: {
 		newUrl() {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/lehre/Studierendenantrag/abmeldung/' + this.student.prestudent_id;
-		},
-		students() {
-			return this.data.map((current)=>
-			{
-				current.name = current.nachname.toUpperCase() + " " + current.vorname + " (" + current.bezeichnung + ")";
-				return current;
-			}).sort(
-				(a, b) => a.name > b.name ? 1 : -1
-			);
 		}
 	},
 	methods: {
@@ -79,12 +70,11 @@ export default {
 					</div>
 					<div class="modal-body">
 						<label for="newAntragModalAutoComplete">{{p.t('person','studentIn')}}</label>
-						<!-- TODO(chris): IMPLEMENT!! -->
 						<div>
 							<auto-complete
 								class="w-100"
 								v-model="student"
-								:suggestions="students"
+								:suggestions="data"
 								optionLabel = "name"
 								@complete="loadData"
 								inputId="newAntragModalAutoComplete"