diff --git a/tasks/admin_users.yml b/tasks/admin_users.yml
index 1bdefb117280c2d5cd5615bb26902d7f1aefa407..2a510ba0fc5d444556f566184784183b63ae0a1f 100644
--- a/tasks/admin_users.yml
+++ b/tasks/admin_users.yml
@@ -11,3 +11,4 @@
     path: /etc/ssh/sshd_config
     regexp: PasswordAuthentication
     replace: 'PasswordAuthentication no\1' 
+  when: yunohost.nopassword == true