diff --git a/src/Form/AdminPages/AttachmentTypeAdminForm.php b/src/Form/AdminPages/AttachmentTypeAdminForm.php
index cf410a43..7f9e7646 100644
--- a/src/Form/AdminPages/AttachmentTypeAdminForm.php
+++ b/src/Form/AdminPages/AttachmentTypeAdminForm.php
@@ -52,7 +52,7 @@ class AttachmentTypeAdminForm extends BaseEntityAdminForm
             if (!is_a($class, Attachment::class, true)) {
                 return $class;
             }
-            return new StaticMessage($this->elementTypeNameGenerator->typeLabel($class::ALLOWED_ELEMENT_CLASS));
+            return new StaticMessage($this->elementTypeNameGenerator->typeLabelPlural($class::ALLOWED_ELEMENT_CLASS));
         };
 
 
diff --git a/src/Services/UserSystem/UserAvatarHelper.php b/src/Services/UserSystem/UserAvatarHelper.php
index 9dbe9c12..a1a69cb9 100644
--- a/src/Services/UserSystem/UserAvatarHelper.php
+++ b/src/Services/UserSystem/UserAvatarHelper.php
@@ -154,6 +154,7 @@ class UserAvatarHelper
                 $attachment_type = new AttachmentType();
                 $attachment_type->setName('Avatars');
                 $attachment_type->setFiletypeFilter('image/*');
+                $attachment_type->setAllowedTargets([UserAttachment::class]);
                 $this->entityManager->persist($attachment_type);
             }