diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index fbc491bb..d2a315eb 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -89,12 +89,12 @@ class Changeset < ActiveRecord::Base
   # Attribute reader for committer that encodes the committer string to
   # the repository log encoding (e.g. UTF-8)
   def committer
-    self.class.to_utf8(read_attribute(:committer), repository.repo_log_encoding)
+    self.class.to_utf8(read_attribute(:committer), repository_encoding)
   end
 
   def before_create
-    self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
-    self.comments  = self.class.normalize_comments(self.comments, repository.repo_log_encoding)
+    self.committer = self.class.to_utf8(self.committer, repository_encoding)
+    self.comments  = self.class.normalize_comments(self.comments, repository_encoding)
     self.user = repository.find_committer_user(self.committer)
   end