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 c04778580bc9b3e65043a213ce91608f1b582a66..637570b5989997a5422fda31e340869aacbdc9af 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
@@ -315,8 +315,11 @@ public class UserController extends HttpServlet {
                         String messageKey = "";
                         if(userId > 0)
                         {
-                            // Superuser can change username and password
-                            if(user.isSuperUser())
+                            // Superuser can change username and password for everyone
+                            // Organization admin can change username and password for members of on organization
+                            if(user.isSuperUser() ||
+                                    (user.isOrganizationAdmin() && viewUser.getOrganization_id().equals(user.getOrganization_id()))
+                            )
                             {
                                 UserAuthentication auth = viewUser.getPasswordAuthentication();
                                 auth.setUsername(username);