diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
index fc9eeadf2cf8afab4d028239aa44d5f699376b2d..bc79612b2def2af1ca6b0161ced81adf95d22573 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
@@ -102,6 +102,11 @@ public class UserController extends HttpServlet {
                     request.setAttribute("organizations", organizations);
                     request.setAttribute("vipsLogicRoles", em.createNamedQuery("VipsLogicRole.findAll").getResultList());
                 }
+                else if(user.isOrganizationAdmin())
+                {
+                    request.setAttribute("vipsLogicRoles", em.createNamedQuery("VipsLogicRole.findAll").getResultList());
+                    users = userBean.getUsers(user.getOrganizationId());
+                }
                 else
                 {
                     users = userBean.getUsers(user.getOrganizationId());