diff --git a/src/api/admin.rs b/src/api/admin.rs
index 0c90dd3b..d82de3d0 100644
--- a/src/api/admin.rs
+++ b/src/api/admin.rs
@@ -385,8 +385,13 @@ async fn users_overview(_token: AdminToken, conn: DbConn) -> ApiResult<Html<Stri
 
 #[get("/users/by-mail/<mail>")]
 async fn get_user_by_mail_json(mail: &str, _token: AdminToken, conn: DbConn) -> JsonResult {
-    if let Some((u, sso)) = SsoUser::find_by_mail(mail, &conn).await {
-        let user_json = enrich_users_json(vec![(u, sso)], &conn).await[0].clone();
+    if let Some((user, sso_user)) = SsoUser::find_by_mail(mail, &conn).await {
+        let user_json = enrich_users_json(vec![(user, sso_user)], &conn)
+            .await
+            .into_iter()
+            .next()
+            .clone()
+            .ok_or(Error::new("Could not build user JSON", "").with_code(Status::InternalServerError.code))?;
         Ok(Json(user_json))
     } else {
         err_code!("User doesn't exist", Status::NotFound.code);
@@ -397,7 +402,12 @@ async fn get_user_by_mail_json(mail: &str, _token: AdminToken, conn: DbConn) ->
 async fn get_user_json(user_id: UserId, _token: AdminToken, conn: DbConn) -> JsonResult {
     let user = get_user_or_404(&user_id, &conn).await?;
     let sso_user = SsoUser::find_by_uuid(&user_id, &conn).await;
-    let user_json = enrich_users_json(vec![(user, sso_user)], &conn).await[0].clone();
+    let user_json = enrich_users_json(vec![(user, sso_user)], &conn)
+        .await
+        .into_iter()
+        .next()
+        .clone()
+        .ok_or(Error::new("Could not build user JSON", "").with_code(Status::InternalServerError.code))?;
 
     Ok(Json(user_json))
 }
@@ -581,7 +591,7 @@ async fn organizations_overview(_token: AdminToken, conn: DbConn) -> ApiResult<H
         org["collection_count"] = json!(Collection::count_by_org(&o.uuid, &conn).await);
         org["group_count"] = json!(Group::count_by_org(&o.uuid, &conn).await);
         org["event_count"] = json!(Event::count_by_org(&o.uuid, &conn).await);
-        org["attachment_count"] = json!(Attachment::count_by_org(&o.uuid, &conn).await);
+        org["attachmentCount"] = json!(Attachment::count_by_org(&o.uuid, &conn).await);
         org["attachment_size"] = json!(get_display_size(Attachment::size_by_org(&o.uuid, &conn).await));
         organizations_json.push(org);
     }
diff --git a/src/static/templates/admin/organizations.hbs b/src/static/templates/admin/organizations.hbs
index 14f06e34..698c33ce 100644
--- a/src/static/templates/admin/organizations.hbs
+++ b/src/static/templates/admin/organizations.hbs
@@ -33,8 +33,8 @@
                             <span class="d-block">{{cipher_count}}</span>
                         </td>
                         <td>
-                            <span class="d-block"><strong>Amount:</strong> {{attachment_count}}</span>
-                            {{#if attachment_count}}
+                            <span class="d-block"><strong>Amount:</strong> {{attachmentCount}}</span>
+                            {{#if attachmentCount}}
                             <span class="d-block"><strong>Size:</strong> {{attachment_size}}</span>
                             {{/if}}
                         </td>
diff --git a/src/static/templates/admin/users.hbs b/src/static/templates/admin/users.hbs
index 336b965a..e4d5171c 100644
--- a/src/static/templates/admin/users.hbs
+++ b/src/static/templates/admin/users.hbs
@@ -63,7 +63,7 @@
                         </td>
                         <td>
                             <span class="d-block"><strong>Amount:</strong> {{attachmentCount}}</span>
-                            {{#if attachment_count}}
+                            {{#if attachmentCount}}
                             <span class="d-block"><strong>Size:</strong> {{attachmentSize}}</span>
                             {{/if}}
                         </td>