diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb
index bba11e41..b5fc2d62 100644
--- a/lib/submitters/submit_values.rb
+++ b/lib/submitters/submit_values.rb
@@ -21,7 +21,9 @@ module Submitters
         SendWebhookRequestJob.perform_later(submitter)
       end
 
-      submitter.submission.template.account.users.active.admins.each do |user|
+      user = submitter.submission.created_by_user || submitter.template.author
+
+      if submitter.template.account.users.exists?(id: user.id)
         SubmitterMailer.completed_email(submitter, user).deliver_later!
       end