diff --git a/controllers/users.js b/controllers/users.js
index c66131d..88137ed 100644
--- a/controllers/users.js
+++ b/controllers/users.js
@@ -357,19 +357,25 @@ router.get('/search', function (req, res, next) {
 							$options: 'i',
 						},
 					},
+					{
+						ldapId: {
+							$regex: _.escapeRegExp(req.query.q),
+								$options: 'i',
+						},
+					},
 				],
 				schoolId: req.query.schoolId ? req.query.schoolId : undefined,
-				$populate: ['roles', 'schoolId'],
 				$limit: itemsPerPage,
 				$skip: itemsPerPage * (currentPage - 1),
 				$sort: req.query.sort,
+				$populate: ['roles', 'schoolId'],
 			},
 		})
 		.then((data) => {
 			api(req)
 				.get('/roles')
 				.then((role) => {
-					const head = ['Vorname', 'Nachname', 'E-Mail-Adresse', 'Rollen', 'Schule', ''];
+					const head = ['ID', 'Vorname', 'Nachname', 'E-Mail-Adresse', 'Rollen', 'Schule', 'External Id', ''];
 
 					const body = data.data.map((item) => {
 						let roles = item.roles
@@ -378,11 +384,13 @@ router.get('/search', function (req, res, next) {
 							})
 							.join(', ');
 						return [
+							item._id || '',
 							item.firstName || '',
 							item.lastName || '',
 							item.email || '',
 							roles || '',
 							(item.schoolId || {}).name || '',
+							item.ldapId || '',
 							getTableActions(item, '/users/'),
 						];
 					});
@@ -462,7 +470,7 @@ router.get('/', function (req, res, next) {
 						},
 					})
 					.then((data) => {
-						const head = ['ID', 'Vorname', 'Nachname', 'E-Mail-Adresse', 'Rollen', ''];
+						const head = ['ID', 'Vorname', 'Nachname', 'E-Mail-Adresse', 'Rollen', 'External Id', ''];
 
 						const body = data.data.map((item) => {
 							if (!item.deletedAt) {
@@ -477,6 +485,7 @@ router.get('/', function (req, res, next) {
 									item.lastName || '',
 									item.email || '',
 									roles || '',
+									item.ldapId || '',
 									getTableActions(item, '/users/'),
 								];
 							}
diff --git a/static/scripts/schools.js b/static/scripts/schools.js
index d9e1a39..ebf21a0 100644
--- a/static/scripts/schools.js
+++ b/static/scripts/schools.js
@@ -107,6 +107,7 @@ $(document).ready(function () {
         'Migration abgeschlossen': 'userLoginMigration.closedAt',
         'Migration final beendet': 'userLoginMigration.finishedAt',
         'Login-System': 'systems',
+        'External Id': 'ldapId',
 
         'subject': 'Titel',
         'firstName': 'Vorname',
@@ -135,7 +136,8 @@ $(document).ready(function () {
         'userLoginMigration.mandatorySince': 'Migration verpflichtend',
         'userLoginMigration.closedAt': 'Migration abgeschlossen',
         'userLoginMigration.finishedAt': 'Migration final beendet',
-        'systems': 'Login-System'
+        'systems': 'Login-System',
+        'ldapId': 'External Id'
     };
 
     $('tr th').each(function(i,j) {
diff --git a/views/ctltools/ctltools.hbs b/views/ctltools/ctltools.hbs
index aedfa86..f19e85c 100644
--- a/views/ctltools/ctltools.hbs
+++ b/views/ctltools/ctltools.hbs
@@ -29,7 +29,7 @@
                 <div class="col-sm-3" style="padding-bottom: 20px">
                     <form class="search-wrapper" action="/ctltools/search/" method="get">
                         <div class="input-group input-group-sm">
-                            <input type="text" class="form-control search-field" placeholder="Suche nach Tools..." name="q" />
+                            <input type="text" class="form-control search-field" placeholder="Suche nach Tools... (Name)" name="q" />
                             <span class="input-group-btn">
                                 <button type="submit" class="btn btn-secondary">
                                     <i class="fa fa-search"></i>
diff --git a/views/lib/components/table.hbs b/views/lib/components/table.hbs
index 58e4e51..034db57 100644
--- a/views/lib/components/table.hbs
+++ b/views/lib/components/table.hbs
@@ -51,7 +51,7 @@
                                         <img src="{{this.url}}" alt="{{this.alt}}" height="{{this.height}}" width="{{this.width}}" class="{{this.class}}">
                                     </td>
                                 {{else}}
-                                    <td>{{{this}}}</td>
+                                    <td style="max-width: 25vw; overflow-wrap: break-word;">{{{this}}}</td>
                                 {{/if}}
                             {{/ifArray}}
                         {{/each}}
diff --git a/views/schools/forms/add-school.hbs b/views/schools/forms/add-school.hbs
index 1cdcd13..879ee4f 100644
--- a/views/schools/forms/add-school.hbs
+++ b/views/schools/forms/add-school.hbs
@@ -46,8 +46,8 @@
 </div>
 
 <div class="form-group">
-    <label class="control-label" for="externalId">External Id</label>
-    <input id="externalId" name="ldapSchoolIdentifier" class="form-control" readonly>
+    <label class="control-label" for="ldapId">External Id</label>
+    <input id="ldapId" name="ldapSchoolIdentifier" class="form-control" readonly>
 </div>
 
 <div class="form-group">
diff --git a/views/schools/schools.hbs b/views/schools/schools.hbs
index 2721fcc..b368184 100644
--- a/views/schools/schools.hbs
+++ b/views/schools/schools.hbs
@@ -16,7 +16,7 @@
                     <div class="col-sm-3" style="padding-bottom: 20px">
                         <form class="search-wrapper" action="/schools/" method="get">
                             <div class="input-group input-group-sm">
-                                <input type="text" class="form-control search-field" placeholder="Suche nach Schulen..." name="q" />
+                                <input type="text" class="form-control search-field" placeholder="Suche nach Schulen... (Name)" name="q" />
                                 <span class="input-group-btn">
                                             <button type="submit" class="btn btn-secondary">
                                                 <i class="fa fa-search"></i>
diff --git a/views/users/forms/edit-user.hbs b/views/users/forms/edit-user.hbs
index 847db6f..24fc08b 100644
--- a/views/users/forms/edit-user.hbs
+++ b/views/users/forms/edit-user.hbs
@@ -20,6 +20,6 @@
     </select>
 </div>
 <div class="form-group">
-    <label class="control-label" for="externalId">External Id</label>
-    <input id="externalId" name="ldapId" class="form-control" readonly></input>
-</div>
\ No newline at end of file
+    <label class="control-label" for="ldapId">External Id</label>
+    <input id="ldapId" name="ldapId" class="form-control" readonly></input>
+</div>
diff --git a/views/users/preselect.hbs b/views/users/preselect.hbs
index 4cd1c49..384348c 100644
--- a/views/users/preselect.hbs
+++ b/views/users/preselect.hbs
@@ -15,7 +15,7 @@
                 <div class="col-sm-3" style="padding-bottom: 20px">
                     <form class="search-wrapper" action="/users/search/" method="get">
                         <div class="input-group input-group-sm">
-                            <input type="text" class="form-control search-field" placeholder="Suche nach Nutzern..." name="q" />
+                            <input type="text" class="form-control search-field" placeholder="Suche nach Nutzenden... (Vor-/Nachname/External Id)" name="q" />
                             <span class="input-group-btn">
                                             <button type="submit" class="btn btn-secondary">
                                                 <i class="fa fa-search"></i>
diff --git a/views/users/users.hbs b/views/users/users.hbs
index c17d018..3f14b80 100644
--- a/views/users/users.hbs
+++ b/views/users/users.hbs
@@ -23,7 +23,7 @@
                         <form class="search-wrapper" action="/users/search/" method="get">
                             <div class="input-group input-group-sm">
                                 <input type="hidden" name="schoolId" value="{{schoolId}}">
-                                <input type="text" class="form-control search-field" placeholder="Suche nach Nutzern..." name="q" />
+                                <input type="text" class="form-control search-field" placeholder="Suche nach Nutzenden... (Vor-/Nachname/External Id)" name="q" />
                                 <span class="input-group-btn">
                                             <button type="submit" class="btn btn-secondary">
                                                 <i class="fa fa-search"></i>