diff --git a/src/Controllers/UsersController.cs b/src/Controllers/UsersController.cs
index 630c41b..bdc7782 100644
--- a/src/Controllers/UsersController.cs
+++ b/src/Controllers/UsersController.cs
@@ -63,6 +63,10 @@ public class UsersController : Controller
     [HttpPost("Create")]
     public async Task<UsersCreateResponseModel> Create([FromBody] UsersCreateRequestModel requestModel)
     {
+        if (requestModel is null)
+        {
+            return new() { Success = false, Exception = "The request model is null" };
+        }
         try
         {
             string? jpegPhoto = requestModel.JpegPhoto;
diff --git a/src/Resources/Views.Home.Users.de.resx b/src/Resources/Views.Home.Users.de.resx
index a779788..828b8ed 100644
--- a/src/Resources/Views.Home.Users.de.resx
+++ b/src/Resources/Views.Home.Users.de.resx
@@ -127,4 +127,7 @@
     <data name="Confirm Delete" xml:space="preserve">
         <value>Löschen bestätigen</value>
     </data>
+    <data name="Password must be at least 8 characters long and include upper, lower, number, and special character" xml:space="preserve">
+        <value>Passwörter müssen mindestens 8 Zeichen lang sein und Groß- und Kleinbuchstaben, sowie mindestens eine Zahl und mindestens ein Sonderzeichen enthalten</value>
+    </data>
 </root>
diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml
index ca68980..b4c5345 100644
--- a/src/Views/Home/Users.cshtml
+++ b/src/Views/Home/Users.cshtml
@@ -112,10 +112,8 @@
         deleteModal.addEventListener('show.bs.modal', event => {
             currentButton = event.relatedTarget; // Button that triggered the modal
             const userId = currentButton.getAttribute('data-user-id');
-            const userName = currentButton.getAttribute('data-user-name');
 
             deleteModal.querySelector('#userId').textContent = userId;
-            deleteModal.querySelector('#userName').textContent = userName;
 
         });
 
@@ -123,7 +121,6 @@
         const deleteForm = document.getElementById('deleteForm');
         deleteForm.addEventListener('submit', async e => {
             e.preventDefault();
-            console.log(deleteForm);
             const userId = deleteModal.querySelector('#userId').textContent;
             const url = `/Users/Delete?uid=${userId}`;
 
@@ -298,6 +295,12 @@
 
         updateForm.addEventListener('submit', async e => {
             e.preventDefault();
+
+            const password = updateForm.querySelector('input[name="UserPassword"]').value;
+            if (password.length > 0 && !validatePassword(password)) {
+                showToast('@T["Password must be at least 8 characters long and include upper, lower, number, and special character"]', 'danger');
+                return;
+            }
             var dataFromEntries = Object.fromEntries(new FormData(updateForm).entries());
             var data = unflatten(dataFromEntries);
             data.Description.Groups = Array.from(updateForm.querySelector('#updateGroups').selectedOptions).map(option => option.value);
@@ -543,6 +546,13 @@
         // Submit create form
         createForm.addEventListener('submit', async e => {
             e.preventDefault();
+
+            const password = createForm.querySelector('input[name="UserPassword"]').value;
+            if (password == null || !validatePassword(password)) {
+                showToast('@T["Password must be at least 8 characters long and include upper, lower, number, and special character"]', 'danger');
+                return;
+            }
+
             const dataFromEntries = Object.fromEntries(new FormData(createForm).entries());
             const data = unflatten(dataFromEntries);
             data.Description.Groups = Array.from(createGroupsSelect.selectedOptions).map(o => o.value);
@@ -564,7 +574,7 @@
                     const newRow = document.createElement('tr');
                     newRow.innerHTML = `
                         <td><img class="rounded-circle user-icon" src="data:image/jpeg;base64,${data.JpegPhoto || ''}" alt="Photo" style="max-width:300px;" /></td>
-                        <td>${result.NewUid || ''}</td>
+                        <td>${result.Uid || ''}</td>
                         <td>${data.Title || ''}</td>
                         <td>${data.Cn || ''}</td>
                         <td>${data.Sn || ''}</td>
@@ -576,22 +586,29 @@
                                     data-user-title="${data.Title || ''}"
                                     data-user-name="${data.Cn || ''}"
                                     data-user-surname="${data.Sn || ''}"
+                                    data-user-birthdate="${data.BirthDate}"
+                                    data-user-address-city="${data.Description.Address.City}"
+                                    data-user-address-street="${data.Description.Address.Street}"
+                                    data-user-address-streetnr="${data.Description.Address.StreetNr}"
                                     data-user-workplace="${data.Description?.Workplace || ''}"
                                     data-user-groups='${JSON.stringify(data.Description?.Groups || [])}'
                                     data-bs-toggle="modal"
                                     data-bs-target="#updateModal">
-                                    Update
+                                    @T["Update"]
                                 </button>
                                 <button class="btn btn-sm btn-danger btn-delete"
                                     data-user-id="${result.NewUid || ''}"
                                     data-user-name="${data.Cn || ''}"
                                     data-bs-toggle="modal"
                                     data-bs-target="#deleteModal">
-                                    Delete
+                                    @T["Delete"]
                                 </button>
                             </div>
                         </td>
                     `;
+                    newRow.setAttribute("data-asset-id", result.Uid);
+                    newRow.classList.toggle("user-row");
+                    registerRowDetailviewClick(newRow);
                     tbody.appendChild(newRow);
                 } else {
                     showToast(`${result.Exception || '@T["Create failed"]'}`, 'danger');
@@ -689,52 +706,53 @@
 <script>
     document.addEventListener('DOMContentLoaded', () => {
         const rows = document.querySelectorAll('table tbody tr');
+
+        rows.forEach(row => registerRowDetailviewClick(row));
+    });
+    function registerRowDetailviewClick(row) {
         const detailModalEl = document.getElementById('detailModal');
         const detailModal = new bootstrap.Modal(detailModalEl);
+        row.addEventListener('click', (e) => {
+            // Don’t trigger when clicking inside the action buttons
+            if (e.target.closest('button')) return;
 
-        rows.forEach(row => {
-            row.addEventListener('click', (e) => {
-                // Don’t trigger when clicking inside the action buttons
-                if (e.target.closest('button')) return;
+            const updateBtn = row.querySelector('.btn-warning[data-user-id]');
+            if (!updateBtn) return;
 
-                const updateBtn = row.querySelector('.btn-warning[data-user-id]');
-                if (!updateBtn) return;
-
-                // Extract data from update button
-                const data = {
-                    uid: updateBtn.dataset.userId,
-                    title: updateBtn.dataset.userTitle,
-                    name: updateBtn.dataset.userName,
-                    surname: updateBtn.dataset.userSurname,
-                    workplace: updateBtn.dataset.userWorkplace,
-                    birthdate: updateBtn.dataset.userBirthdate,
-                    city: updateBtn.dataset.userAddressCity,
-                    street: updateBtn.dataset.userAddressStreet,
-                    streetNr: updateBtn.dataset.userAddressStreetnr,
-                    groups: JSON.parse(updateBtn.dataset.userGroups || '[]'),
-                };
+            // Extract data from update button
+            const data = {
+                uid: updateBtn.dataset.userId,
+                title: updateBtn.dataset.userTitle,
+                name: updateBtn.dataset.userName,
+                surname: updateBtn.dataset.userSurname,
+                workplace: updateBtn.dataset.userWorkplace,
+                birthdate: updateBtn.dataset.userBirthdate,
+                city: updateBtn.dataset.userAddressCity,
+                street: updateBtn.dataset.userAddressStreet,
+                streetNr: updateBtn.dataset.userAddressStreetnr,
+                groups: JSON.parse(updateBtn.dataset.userGroups || '[]'),
+            };
 
 
-                // Fill modal fields
-                document.getElementById('detailUid').value = data.uid || '';
-                document.getElementById('detailTitle').value = data.title || '';
-                document.getElementById('detailName').value = data.name || '';
-                document.getElementById('detailSurname').value = data.surname || '';
-                document.getElementById('detailBirthdate').value = data.birthdate || '';
-                document.getElementById('detailCity').value = data.city || '';
-                document.getElementById('detailStreet').value = data.street || '';
-                document.getElementById('detailStreetNr').value = data.streetNr || '';
-                document.getElementById('detailWorkplace').value = data.workplace || '';
-                document.getElementById('detailGroups').value = data.groups.join(', ') || '';
+            // Fill modal fields
+            document.getElementById('detailUid').value = data.uid || '';
+            document.getElementById('detailTitle').value = data.title || '';
+            document.getElementById('detailName').value = data.name || '';
+            document.getElementById('detailSurname').value = data.surname || '';
+            document.getElementById('detailBirthdate').value = data.birthdate || '';
+            document.getElementById('detailCity').value = data.city || '';
+            document.getElementById('detailStreet').value = data.street || '';
+            document.getElementById('detailStreetNr').value = data.streetNr || '';
+            document.getElementById('detailWorkplace').value = data.workplace || '';
+            document.getElementById('detailGroups').value = data.groups.join(', ') || '';
 
-                // Photo
-                const imgEl = row.querySelector('td:first-child img');
-                const detailPhoto = document.getElementById('detailPhoto');
-                detailPhoto.src = `/Home/UserPhoto?uid=${data.uid}&size=256`;
-                detailModal.show();
-            });
+            // Photo
+            const imgEl = row.querySelector('td:first-child img');
+            const detailPhoto = document.getElementById('detailPhoto');
+            detailPhoto.src = `/Home/UserPhoto?uid=${data.uid}&size=256`;
+            detailModal.show();
         });
-    });
+    }
 </script>
 
 <style>
diff --git a/src/wwwroot/js/site.js b/src/wwwroot/js/site.js
index 801cd64..57d910d 100644
--- a/src/wwwroot/js/site.js
+++ b/src/wwwroot/js/site.js
@@ -187,4 +187,11 @@ async function loadUsersIntoSelect(selectElement, selectedValue = null) {
         console.error('Error loading users:', err);
         showToast(appTranslations.errorLoadingUsers, 'danger');
     }
+}
+
+function validatePassword(password) {
+    // Regex: min 8 chars, one uppercase, one lowercase, one number, one special char
+    const strongPasswordRegex =
+        /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*()_\-+=\[{\]};:'",<.>/?\\|`~]).{8,}$/;
+    return strongPasswordRegex.test(password);
 }
\ No newline at end of file