diff --git a/backend/renders/renders.go b/backend/renders/renders.go
index f5adf49..a870824 100644
--- a/backend/renders/renders.go
+++ b/backend/renders/renders.go
@@ -129,7 +129,16 @@ func AdminUserCreateForm(db *gorm.DB) http.HandlerFunc {
 			ssoid := val.(string)
 			var user models.User
 			if err := db.Where("sso_id = ?", ssoid).First(&user).Error; err == nil {
-				data["User"] = user
+				data["U"] = user
+			}
+		}
+		if _, exists := data["User"]; !exists {
+			if val := r.Context().Value("ssoid"); val != nil {
+				ssoid := val.(string)
+				var user models.User
+				if err := db.Where("sso_id = ?", ssoid).First(&user).Error; err == nil {
+					data["User"] = user
+				}
 			}
 		}
 		renderTemplate(w, "admin_user_create", data)
diff --git a/frontend/templates/admin_user_edit.pages.tmpl b/frontend/templates/admin_user_edit.pages.tmpl
index 147a5bc..adf31af 100644
--- a/frontend/templates/admin_user_edit.pages.tmpl
+++ b/frontend/templates/admin_user_edit.pages.tmpl
@@ -8,11 +8,11 @@
 
 <!-- Flash message -->
 <div id="userFlash"></div>
-<form hx-put="/api/user/update/{{ .User.ID }}" hx-target="#userFlash" hx-swap="outerHTML" class="box">
+<form hx-put="/api/user/update/{{ .U.ID }}" hx-target="#userFlash" hx-swap="outerHTML" class="box">
   <div class="field">
     <label class="label">Email</label>
     <div class="control">
-      <input class="input" type="email" name="email" value="{{ .User.Email }}" required>
+      <input class="input" type="email" name="email" value="{{ .U.Email }}" required>
     </div>
   </div>
 
@@ -28,8 +28,8 @@
     <div class="control">
       <div class="select">
         <select name="role">
-          <option value="CLIENT" {{ if eq .User.Role "CLIENT" }}selected{{ end }}>Client</option>
-          <option value="ADMIN" {{ if eq .User.Role "ADMIN" }}selected{{ end }}>Admin</option>
+          <option value="CLIENT" {{ if eq .U.Role "CLIENT" }}selected{{ end }}>Client</option>
+          <option value="ADMIN" {{ if eq .U.Role "ADMIN" }}selected{{ end }}>Admin</option>
         </select>
       </div>
     </div>
@@ -37,18 +37,18 @@
 
   <div class="field">
     <label class="checkbox">
-      <input type="checkbox" name="is_active" {{ if .User.IsActive }}checked{{ end }}> Actif
+      <input type="checkbox" name="is_active" {{ if .U.IsActive }}checked{{ end }}> Actif
     </label>
   </div>
 
   <div class="field">
     <label class="label">Token WhatsApp</label>
-    <input class="input" name="whatsapp_token" type="text" value="{{ .User.WhatsappToken }}">
+    <input class="input" name="whatsapp_token" type="text" value="{{ .U.WhatsappToken }}">
   </div>
 
   <div class="field">
     <label class="label">Phone Number ID</label>
-    <input class="input" name="whatsapp_phone_number_id" type="text" value="{{ .User.WhatsappPhoneNumberID }}">
+    <input class="input" name="whatsapp_phone_number_id" type="text" value="{{ .U.WhatsappPhoneNumberID }}">
   </div>
 
   <div class="field">