diff --git a/app/views/admin/search.html.erb b/app/views/admin/search.html.erb
index 67c97366e..5d49d84fa 100644
--- a/app/views/admin/search.html.erb
+++ b/app/views/admin/search.html.erb
@@ -26,7 +26,7 @@
      
 
     <div class="autoscroll">
-      <table class="list">
+      <table class="list" style="width: 100%;table-layout: fixed">
         <thead>
         <tr>
           <%= sort_header_tag('login', :caption => l(:field_login)) %>
@@ -37,20 +37,20 @@
           <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
           <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
           <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
-          <th></th>
+          <th style="width: 100px;"></th>
         </tr>
         </thead>
         <tbody>
         <% for user in @users -%>
             <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
-              <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
-              <td class="firstname"><%= h(user.firstname) %></td>
-              <td class="lastname"><%= h(user.lastname) %></td>
-              <td class="email"><%= mail_to(h(user.mail)) %></td>
-              <td align="center"><%= checked_image user.admin? %></td>
-              <td class="created_on" align="center"><%= format_time(user.created_on) %></td>
-              <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-              <td class="buttons"> <%= change_status_link(user) %>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="username" title='<%=user.login%>'> <%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="firstname" align="center" title='<%=user.firstname%>'><%= h(user.firstname) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="lastname" align="center" title='<%=user.lastname%>'><%= h(user.lastname) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="email" align="center" title='<%=user.mail%>'><%= mail_to(h(user.mail)) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center"><%= checked_image user.admin? %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+              <td  class="buttons"> <%= change_status_link(user) %>
                 <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>
diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index 47d588ec2..4a76a42ef 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -50,7 +50,7 @@
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center"><%= checked_image user.admin? %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-              <td> <%= change_status_link(user) %>
+              <td  class="buttons"> <%= change_status_link(user) %>
                 <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
             </tr>
         <% end -%>