diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4085f0288..d84b7bd2b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -70,7 +70,7 @@ curl http://localhost/api/v1/users.json -v -u #{login}:#{password}
     end
     users_all = []
     users.each {|user|
-      users_all.push User.find( user.id )
+      users_all.push User.find( user.id ).attributes_with_associations
     }
     render :json => users_all, :status => :ok
   end
diff --git a/test/browser/manage_test.rb b/test/browser/manage_test.rb
index e24d2b736..178403470 100644
--- a/test/browser/manage_test.rb
+++ b/test/browser/manage_test.rb
@@ -76,11 +76,11 @@ class ManageTest < TestCase
           },
           {
             :execute => 'click',
-            :css     => 'a[data-type="edit"]:last-child',
+            :css     => '.table-overview tr:last-child td',
           },
           {
             :execute => 'wait',
-            :value   => 1,
+            :value   => 2,
           },
           {
             :execute => 'set',
@@ -146,7 +146,7 @@ class ManageTest < TestCase
           },
           {
             :execute => 'click',
-            :css     => 'a[data-type="edit"]:last-child',
+            :css     => '.table-overview tr:last-child td',
           },
           {
             :execute => 'wait',