Index: app/models/user.rb
===================================================================
--- app/models/user.rb	(revision 13179)
+++ app/models/user.rb	(working copy)
@@ -52,15 +52,20 @@
         :order => %w(lastname firstname id),
         :setting_order => 5
       },
+    :lastname_nosp_firstname => {
+        :string => '#{lastname}#{firstname}',
+        :order => %w(lastname firstname id),
+        :setting_order => 6
+      },
     :lastname => {
         :string => '#{lastname}',
         :order => %w(lastname id),
-        :setting_order => 6
+        :setting_order => 7
       },
     :username => {
         :string => '#{login}',
         :order => %w(login id),
-        :setting_order => 7
+        :setting_order => 8
       },
   }
 
@@ -683,17 +688,17 @@
     return if self.id.nil?
 
     substitute = User.anonymous
-    Attachment.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id]) 
+    Attachment.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
     Comment.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
     Issue.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
     Issue.where(['assigned_to_id = ?', id]).update_all('assigned_to_id = NULL')
-    Journal.where(['user_id = ?', id]).update_all(['user_id = ?', substitute.id]) 
+    Journal.where(['user_id = ?', id]).update_all(['user_id = ?', substitute.id])
     JournalDetail.
       where(["property = 'attr' AND prop_key = 'assigned_to_id' AND old_value = ?", id.to_s]).
       update_all(['old_value = ?', substitute.id.to_s])
     JournalDetail.
       where(["property = 'attr' AND prop_key = 'assigned_to_id' AND value = ?", id.to_s]).
-      update_all(['value = ?', substitute.id.to_s]) 
+      update_all(['value = ?', substitute.id.to_s])
     Message.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
     News.where(['author_id = ?', id]).update_all(['author_id = ?', substitute.id])
     # Remove private queries and keep public ones