diff --git a/app/controllers/management/users_controller.rb b/app/controllers/management/users_controller.rb
index 6522fd5a3b9cb5a8b29b34e8124ab720990aa010..93172970be76ceb2d287f69c0d855585bcdaef65 100644
--- a/app/controllers/management/users_controller.rb
+++ b/app/controllers/management/users_controller.rb
@@ -75,7 +75,7 @@ class Management::UsersController < ManagementController
 
   # Use callbacks to share common setup or constraints between actions.
   def set_user
-    @user = user_repository.find params[:id]
+    @user = user_repository.find(params[:id])
   end
 
   # Never trust parameters from the scary internet, only allow the white list through.
diff --git a/app/repositories/orient_db/user_repository.rb b/app/repositories/orient_db/user_repository.rb
index 6fa51a2e45a37e9e5ef5f3612dc610e6004b1fe5..7a904ba1cb44a3d9391054b95662d31878103d9a 100644
--- a/app/repositories/orient_db/user_repository.rb
+++ b/app/repositories/orient_db/user_repository.rb
@@ -31,11 +31,6 @@ module OrientDb
       (result.count > 0)
     end
 
-    def all
-      result = connection.query sprintf("SELECT FROM USER")
-      
-    end
-
     private
 
     def odb_class
diff --git a/app/repositories/user_repository_proxy.rb b/app/repositories/user_repository_proxy.rb
index 3c43aae345d77ac3c8a83d36c7e89db77213c02b..28ce0f857c45c432f906cfe4624406380e88f1ff 100644
--- a/app/repositories/user_repository_proxy.rb
+++ b/app/repositories/user_repository_proxy.rb
@@ -32,6 +32,10 @@ class UserRepositoryProxy
     user.save!
   end
 
+  def all
+    User.includes(:roles).all
+  end
+
   def method_missing(method_name, *arguments, &block)
     User.send(method_name, *arguments, &block)
   end
diff --git a/app/views/management/users/admins.html.erb b/app/views/management/users/admins.html.erb
index 91a70e6ab36aa88ad8d461ee1d82154fdcac2f4d..6c3ae270445dbfb9fdc8eccf0f04614d1a7cd3c2 100644
--- a/app/views/management/users/admins.html.erb
+++ b/app/views/management/users/admins.html.erb
@@ -5,7 +5,7 @@
 
 
 <% admins = Array.new %>
-<% @users = User.all%>
+<% @users = User.includes(:roles).all%>
 <% @users.all.each do |user|%>
   <% admins << user if user.roles[0].name == "admin" %>
 <% end %>
diff --git a/app/views/management/users/curators.html.erb b/app/views/management/users/curators.html.erb
index 4d3e956143bf217de68db3ccb37c1c0a6b0816c8..b5924c8af2f0e80331fe44afac9d3191b77a0ac1 100644
--- a/app/views/management/users/curators.html.erb
+++ b/app/views/management/users/curators.html.erb
@@ -5,7 +5,7 @@
 
 
 <% curators = Array.new %>
-<% @users = User.all%>
+<% @users = User.includes(:roles).all%>
 <% @users.all.each do |user|%>
   <% curators << user if user.roles[0].name == "curator" %>
 <% end %>