diff --git a/backend/src/utils/feedbackValidation.js b/backend/src/utils/feedbackValidation.js
index 1af1794..2c7dbdb 100644
--- a/backend/src/utils/feedbackValidation.js
+++ b/backend/src/utils/feedbackValidation.js
@@ -233,11 +233,11 @@ async function validateGuestRequirements(settings, guestData) {
     errors.push('Name is required');
   }
   
-  // Check for email - handle both undefined and empty strings
+  // Check for email - handle both undefined and empty strings  
   const email = guestData.guest_email;
   if (!email || (typeof email === 'string' && email.trim().length === 0)) {
-    errors.push('Valid email is required');
-  } else if (email && !validator.isEmail(email.trim())) {
+    errors.push('Email is required');
+  } else if (email && typeof email === 'string' && !validator.isEmail(email.trim())) {
     errors.push('Valid email is required');
   }
   
diff --git a/frontend/src/components/admin/FeedbackModerationPanel.tsx b/frontend/src/components/admin/FeedbackModerationPanel.tsx
index 34dbb03..fc1eea2 100644
--- a/frontend/src/components/admin/FeedbackModerationPanel.tsx
+++ b/frontend/src/components/admin/FeedbackModerationPanel.tsx
@@ -126,11 +126,22 @@ export const FeedbackModerationPanel: React.FC<FeedbackModerationPanelProps> = (
                             )}
                           </span>
                         </div>
-                        <p className="mt-1 text-sm text-neutral-700">{item.comment}</p>
-                        {item.photo_filename && (
-                          <p className="mt-1 text-xs text-neutral-500">
-                            {t('feedback.onPhoto', 'On photo')}: {item.photo_filename}
-                          </p>
+                        <p className="mt-1 text-sm text-neutral-700">{item.comment_text || item.comment}</p>
+                        {item.photo_id && (
+                          <div className="mt-2 flex items-center gap-2">
+                            <img 
+                              src={`/api/admin/photos/${eventId}/thumbnail/${item.photo_id}`}
+                              alt={item.filename || 'Photo'}
+                              className="w-16 h-16 object-cover rounded"
+                              onError={(e) => {
+                                // Hide image if thumbnail fails to load
+                                (e.target as HTMLImageElement).style.display = 'none';
+                              }}
+                            />
+                            <p className="text-xs text-neutral-500">
+                              {t('feedback.onPhoto', 'On photo')}: {item.filename || item.photo_filename || `#${item.photo_id}`}
+                            </p>
+                          </div>
                         )}
                       </div>
                     </div>
diff --git a/frontend/src/components/gallery/PhotoComments.tsx b/frontend/src/components/gallery/PhotoComments.tsx
index 995638f..0895d4f 100644
--- a/frontend/src/components/gallery/PhotoComments.tsx
+++ b/frontend/src/components/gallery/PhotoComments.tsx
@@ -103,8 +103,8 @@ export const PhotoComments: React.FC<PhotoCommentsProps> = ({
 
     submitCommentMutation.mutate({
       comment_text: commentText.trim(),
-      guest_name: guestName.trim(),
-      guest_email: guestEmail.trim()
+      guest_name: guestName.trim() || undefined,
+      guest_email: guestEmail.trim() || undefined
     });
   };
 
diff --git a/frontend/src/components/gallery/PhotoFavorites.tsx b/frontend/src/components/gallery/PhotoFavorites.tsx
index 5a00c6f..1d1b511 100644
--- a/frontend/src/components/gallery/PhotoFavorites.tsx
+++ b/frontend/src/components/gallery/PhotoFavorites.tsx
@@ -36,8 +36,8 @@ export const PhotoFavorites: React.FC<PhotoFavoritesProps> = ({
     mutationFn: (data: { guest_name?: string; guest_email?: string } = {}) => 
       feedbackService.submitFeedback(gallerySlug, photoId, {
         feedback_type: 'favorite',
-        guest_name: data.guest_name,
-        guest_email: data.guest_email
+        guest_name: data.guest_name || undefined,
+        guest_email: data.guest_email || undefined
       }),
     onMutate: async () => {
       setIsSubmitting(true);
diff --git a/frontend/src/components/gallery/PhotoLikes.tsx b/frontend/src/components/gallery/PhotoLikes.tsx
index 1837ac7..4f4c5dc 100644
--- a/frontend/src/components/gallery/PhotoLikes.tsx
+++ b/frontend/src/components/gallery/PhotoLikes.tsx
@@ -36,8 +36,8 @@ export const PhotoLikes: React.FC<PhotoLikesProps> = ({
     mutationFn: (data: { guest_name?: string; guest_email?: string } = {}) => 
       feedbackService.submitFeedback(gallerySlug, photoId, {
         feedback_type: 'like',
-        guest_name: data.guest_name,
-        guest_email: data.guest_email
+        guest_name: data.guest_name || undefined,
+        guest_email: data.guest_email || undefined
       }),
     onMutate: async () => {
       setIsSubmitting(true);
diff --git a/frontend/src/components/gallery/PhotoRating.tsx b/frontend/src/components/gallery/PhotoRating.tsx
index acd1307..b247962 100644
--- a/frontend/src/components/gallery/PhotoRating.tsx
+++ b/frontend/src/components/gallery/PhotoRating.tsx
@@ -42,8 +42,8 @@ export const PhotoRating: React.FC<PhotoRatingProps> = ({
       feedbackService.submitFeedback(gallerySlug, photoId, {
         feedback_type: 'rating',
         rating: data.rating,
-        guest_name: data.guest_name,
-        guest_email: data.guest_email
+        guest_name: data.guest_name || undefined,
+        guest_email: data.guest_email || undefined
       }),
     onMutate: async (data) => {
       setIsSubmitting(true);
diff --git a/frontend/src/pages/admin/EventFeedbackPage.tsx b/frontend/src/pages/admin/EventFeedbackPage.tsx
index 36780c8..a53e4ae 100644
--- a/frontend/src/pages/admin/EventFeedbackPage.tsx
+++ b/frontend/src/pages/admin/EventFeedbackPage.tsx
@@ -250,11 +250,17 @@ export const EventFeedbackPage: React.FC = () => {
               {feedbackData?.feedback?.map((item: PhotoFeedback) => (
                 <Card key={item.id} className="overflow-hidden">
                   <div className="p-4 flex items-start gap-4">
-                    <img
-                      src={`/thumbnails/${item.path}`}
-                      alt={item.filename}
-                      className="w-16 h-16 object-cover rounded"
-                    />
+                    {item.photo_id && (
+                      <img
+                        src={`/api/admin/photos/${eventId}/thumbnail/${item.photo_id}`}
+                        alt={item.filename || 'Photo'}
+                        className="w-16 h-16 object-cover rounded"
+                        onError={(e) => {
+                          // Hide image if thumbnail fails to load
+                          (e.target as HTMLImageElement).style.display = 'none';
+                        }}
+                      />
+                    )}
                     <div className="flex-1">
                       <div className="flex items-start justify-between">
                         <div>