diff --git a/app/models/user.rb b/app/models/user.rb
index 4eafe2acb..7212eb67f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -92,12 +92,12 @@ class User < ActiveRecord::Base
       end
 
       def id_to_pretty_name(user_id)
-        id_to_name(user_id).tr("_", " ")
+        id_to_name(user_id).gsub(/([^_])_+(?=[^_])/, "\\1 \\2")
       end
     end
 
     def pretty_name
-      name.tr("_", " ")
+      name.gsub(/([^_])_+(?=[^_])/, "\\1 \\2")
     end
 
     def update_cache
diff --git a/script/fixes/013.rb b/script/fixes/013.rb
index e6bb4c36d..aeb6a4b76 100644
--- a/script/fixes/013.rb
+++ b/script/fixes/013.rb
@@ -13,3 +13,7 @@ Comment.find_each do |comment|
     comment.destroy
   end
 end
+
+User.where("name like ? or name like ?", "\\_%", "%\\_").each do |user|
+  puts "#{user.id}\t#{user.name}\t#{user.level}\t#{user.email}\t#{user.last_logged_in_at}"
+end ; true
\ No newline at end of file