diff --git a/app/models/submission.rb b/app/models/submission.rb
index d9756e36a..8136d2787 100755
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -145,6 +145,7 @@ def save_additional_form_fields(params)
       if assessment.is_section_dependant
         form_hash["section"] = (assessment.lecture?) ? course_user_datum.lecture : course_user_datum.section
       end
+      form_hash["ip"] = self.submitter_ip
       self.settings = form_hash.to_json
       self.save!
   end
diff --git a/app/views/assessments/viewFeedback.html.erb b/app/views/assessments/viewFeedback.html.erb
index fdfadd1e9..1fd5b329f 100755
--- a/app/views/assessments/viewFeedback.html.erb
+++ b/app/views/assessments/viewFeedback.html.erb
@@ -6,7 +6,7 @@
 <%= @score.feedback %>
 Score for this problem: <%= @score.score.to_f().round(1) %>
 
-Graded by: <%= if @score.grader && @score.grader.user then @score.grader.user.email end %>
+Graded by: <%= if @score.grader && @score.grader.user then @score.grader.user.email elsif @assessment.has_autograder? then "Autograder" end %>
 </pre>
 
 <!--