diff --git a/avatar/forms.py b/avatar/forms.py
index 686ae68..9fa9f0b 100644
--- a/avatar/forms.py
+++ b/avatar/forms.py
@@ -52,8 +52,7 @@ class UploadAvatarForm(forms.Form):
                                          'max_valid_size': filesizeformat(settings.AVATAR_MAX_SIZE)})
 
         count = Avatar.objects.filter(user=self.user).count()
-        if (settings.AVATAR_MAX_AVATARS_PER_USER > 1 and
-                count >= settings.AVATAR_MAX_AVATARS_PER_USER):
+        if 1 < settings.AVATAR_MAX_AVATARS_PER_USER <= count:
             error = _("You already have %(nb_avatars)d avatars, "
                       "and the maximum allowed is %(nb_max_avatars)d.")
             raise forms.ValidationError(error % {