diff --git a/actionsmap/yunohost.yml b/actionsmap/yunohost.yml
index 160c0b08..d8521fa5 100644
--- a/actionsmap/yunohost.yml
+++ b/actionsmap/yunohost.yml
@@ -1016,12 +1016,9 @@ tools:
         adminpw:
             action_help: Change admin password
             api: PUT /adminpw
+            configuration:
+                authenticate: all
             arguments:
-                -o:
-                    full: --old-password
-                    extra:
-                        password: ask_current_admin_password
-                        required: True
                 -n:
                     full: --new-password
                     extra:
diff --git a/tools.py b/tools.py
index 4ed21cb2..2aa226d5 100644
--- a/tools.py
+++ b/tools.py
@@ -73,26 +73,22 @@ def tools_ldapinit(auth):
     msignals.display(m18n.n('ldap_initialized'), 'success')
 
 
-def tools_adminpw(old_password, new_password):
+def tools_adminpw(auth, new_password):
     """
     Change admin password
 
     Keyword argument:
         new_password
-        old_password
 
     """
-    old_password.replace('"', '\\"')
-    old_password.replace('&', '\\&')
-    new_password.replace('"', '\\"')
-    new_password.replace('&', '\\&')
-    result = os.system('ldappasswd -h localhost -D cn=admin,dc=yunohost,dc=org -w "%s" -a "%s" -s "%s"' % (old_password, old_password, new_password))
-
-    if result == 0:
-        msignals.display(m18n.n('admin_password_changed'), 'success')
-    else:
+    try:
+        auth.con.passwd_s('cn=admin,dc=yunohost,dc=org', None, new_password)
+    except:
+        logger.exception('unable to change admin password')
         raise MoulinetteError(errno.EPERM,
                               m18n.n('admin_password_change_failed'))
+    else:
+        msignals.display(m18n.n('admin_password_changed'), 'success')
 
 
 def tools_maindomain(auth, old_domain=None, new_domain=None, dyndns=False):