app/views/caboose/orders/admin_index.html.erb in caboose-cms-0.6.29 vs app/views/caboose/orders/admin_index.html.erb in caboose-cms-0.6.30

@@ -13,10 +13,12 @@
   <p><input type='text' name='id' placeholder='Order ID' value="<%= @pager.params['id'] %>" style='width: 100px;' /></p>
   <p><select name='customer_id'>
       <optgroup label='Status' style='width: 100px'>
         <option value=''>-- All customers --</option>        
         <% @customers.each do |c| %>
-          <option value='<%= c.id %>'<%= @pager.params['customer_id'] == c.id ? " selected='true'" : '' %>><%= "#{c.last_name}, #{c.first_name}" %></option>
+          <option value='<%= c.id %>'<%= @pager.params['customer_id'] == c.id ? " selected='true'" : '' %>>
+            <%= c.first_name.blank? && c.last_name.blank? ? c.username : "#{c.last_name}, #{c.first_name}" %>
+          </option>
         <% end %>
       </optgroup>
     </select></p>
   <p><select name='status'>
       <optgroup label='Status'>