more user display changes

app/views/shared/_auto_complete_users.rhtml

@@ -1,5 +1,5 @@
 <ul class="autocomplete">
 <% for user in @users do -%>
-  <li><span class="nick"><%=h user.nick %></span><span class="informal"> (<%= user.ordergroup.name.to_s if user.ordergroup %>)</span></li>
+  <li><span class="nick"><%= show_user(user) %></span><span class="informal"> (<%= user.ordergroup.try(:name) %>)</span></li>
 <% end -%>
-</ul>
+</ul>

app/views/shared/_workgroup_members.haml

@@ -8,7 +8,8 @@
         %div{id: "collapse#{workgroup.id}", class: 'accordion-body collapse'}
           .accordion-inner
             %ul.unstyled
-              - workgroup.users.includes(:groups).order('nick').each do |user|
+              - workgroup.users.includes(:groups).natural_order.each do |user|
                 %li
-                  = user.nick
+                  = show_user(user)
                   %small (#{user.ordergroup.try(:name)})
+