diff --git a/lib/submitters/maybe_update_default_values.rb b/lib/submitters/maybe_update_default_values.rb
index c7ffba63..d7a44911 100644
--- a/lib/submitters/maybe_update_default_values.rb
+++ b/lib/submitters/maybe_update_default_values.rb
@@ -5,14 +5,9 @@ module Submitters
     module_function
 
     def call(submitter, current_user)
-      user =
-        if current_user && current_user.email == submitter.email
-          current_user
-        else
-          submitter.account.users.find_by(email: submitter.email)
-        end
-
-      return if user.blank?
+      return if current_user.blank? || current_user.email != submitter.email
+
+      user = current_user
 
       fields = submitter.submission.template_fields || submitter.submission.template.fields