diff --git a/app/controllers/admin/emails_controller.rb b/app/controllers/admin/emails_controller.rb
index a1872f2e..c5c1576d 100644
--- a/app/controllers/admin/emails_controller.rb
+++ b/app/controllers/admin/emails_controller.rb
@@ -81,6 +81,7 @@ module Admin
 
       recipients.each do |user|
         Mailbot.bulk_mail(@conference, user, subject, body).deliver_later
+        Rails.logger.info "Bulk email queued - Subject: '#{subject}' - Recipient: #{user.email}"
       end
 
       redirect_to admin_conference_emails_path(@conference.short_title),
diff --git a/app/mailers/mailbot.rb b/app/mailers/mailbot.rb
index 7561a912..b2fcdb2c 100644
--- a/app/mailers/mailbot.rb
+++ b/app/mailers/mailbot.rb
@@ -139,8 +139,15 @@ class Mailbot < ActionMailer::Base
   end
 
   def bulk_mail(conference, user, subject, body)
+    from_email = conference.contact&.email.presence ||
+                 ENV['OSEM_EMAIL_ADDRESS'] ||
+                 Rails.application.config.action_mailer.smtp_settings&.dig(:user_name) ||
+                 'noreply@osem.example.com'
+
+    Rails.logger.info "Bulk email delivered - Subject: '#{subject}' - From: #{from_email} - Recipient: #{user.email}"
+
     mail(to:      user.email,
-         from:    conference.contact.email,
+         from:    from_email,
          subject: subject,
          body:    EmailSettings.new.generate_email_on_conf_updates(conference, user, body))
   end