diff --git a/app/admin/admin_users.rb b/app/admin/admin_users.rb
index fed0ec1a8..c09dc1804 100644
--- a/app/admin/admin_users.rb
+++ b/app/admin/admin_users.rb
@@ -1,6 +1,13 @@
 ActiveAdmin.register AdminUser do
   permit_params :email, :password, :password_confirmation
 
+  controller do
+    def update_resource(object, attributes)
+      update_method = attributes.first[:password].present? ? :update_attributes : :update_without_password
+      object.send(update_method, *attributes)
+    end
+  end
+
   index do
     selectable_column
     id_column
diff --git a/app/admin/users.rb b/app/admin/users.rb
index 1390dd340..75575402d 100644
--- a/app/admin/users.rb
+++ b/app/admin/users.rb
@@ -1,6 +1,13 @@
 ActiveAdmin.register User do
   permit_params :name, :email, :password, :password_confirmation, :organisation_id
 
+  controller do
+    def update_resource(object, attributes)
+      update_method = attributes.first[:password].present? ? :update_attributes : :update_without_password
+      object.send(update_method, *attributes)
+    end
+  end
+
   index do
     selectable_column
     id_column