2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index aaf171c4c..a7d482930 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -156,6 +156,10 @@ class InfoRequest < ActiveRecord::Base
         end
     end
 
+    def user_json_for_api
+        is_external? ? { :name => user_name || _("Anonymous user") } : user.json_for_api
+    end
+
     @@custom_states_loaded = false
     begin
         if !Rails.env.test?
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 469aabc4a..0967e3940 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -420,7 +420,7 @@ class InfoRequestEvent < ActiveRecord::Base
         if deep
             ret[:info_request] = self.info_request.json_for_api(false)
             ret[:public_body] = self.info_request.public_body.json_for_api
-            ret[:user] = self.info_request.user.json_for_api
+            ret[:user] = self.info_request.user_json_for_api
         end
 
         return ret