diff --git a/evolinux-users/tasks/ssh.yml b/evolinux-users/tasks/ssh.yml
index 8982dd6c..16cb1f30 100644
--- a/evolinux-users/tasks/ssh.yml
+++ b/evolinux-users/tasks/ssh.yml
@@ -26,57 +26,72 @@
     loop_var: ssk_key
   when: user.ssh_keys is defined
 
-# we must double-escape caracters, because python
-- name: verify AllowUsers directive
-  shell: "grep -E '^AllowUsers' /etc/ssh/sshd_config"
+- name: verify AllowGroups directive
+  shell: "grep -E '^AllowGroups' /etc/ssh/sshd_config"
   changed_when: False
   failed_when: False
-  register: grep_allowusers_ssh
+  register: grep_allowgroups_ssh
   check_mode: no
 
-- name: "Add AllowUsers sshd directive for '{{ user.name }}'"
-  lineinfile:
-    dest: /etc/ssh/sshd_config
-    line: "\nAllowUsers {{ user.name }}"
-    insertafter: 'Subsystem'
-    validate: '/usr/sbin/sshd -T -f %s'
-  notify: reload sshd
-  when: grep_allowusers_ssh.rc != 0
+  # If AllowGroups is present, we don't change
+- debug:
+    msg: "AllowGroups detected : You have to configure SSH manually"
+  when: grep_allowgroups_ssh.rc == 0
 
-- name: "Modify AllowUsers sshd directive for '{{ user.name }}'"
-  replace:
-    dest: /etc/ssh/sshd_config
-    regexp: '^(AllowUsers ((?!\b{{ user.name }}\b).)*)$'
-    replace: '\1 {{ user.name }}'
-    validate: '/usr/sbin/sshd -T -f %s'
-  notify: reload sshd
-  when: grep_allowusers_ssh.rc == 0
+- block:
+  # If AllowGroups is not present, we proceed as usual
+  - name: verify AllowUsers directive
+    shell: "grep -E '^AllowUsers' /etc/ssh/sshd_config"
+    changed_when: False
+    failed_when: False
+    register: grep_allowusers_ssh
+    check_mode: no
 
-- name: "verify Match User directive"
-  command: "grep 'Match User' /etc/ssh/sshd_config"
-  changed_when: False
-  failed_when: False
-  register: grep_matchuser_ssh
-  check_mode: no
+  - name: "Add AllowUsers sshd directive for '{{ user.name }}'"
+    lineinfile:
+      dest: /etc/ssh/sshd_config
+      line: "\nAllowUsers {{ user.name }}"
+      insertafter: 'Subsystem'
+      validate: '/usr/sbin/sshd -T -f %s'
+    notify: reload sshd
+    when: grep_allowusers_ssh.rc != 0
 
-- name: "Add Match User sshd directive for '{{ user.name }}' (Jessie)"
-  lineinfile:
-    dest: /etc/ssh/sshd_config
-    line: "\nMatch User {{ user.name }}\n    PasswordAuthentication no"
-    insertafter: "# END EVOLINUX PASSWORD RESTRICTIONS BY ADDRESS"
-    validate: '/usr/sbin/sshd -T -f %s'
-  notify: reload sshd
-  when:
-    - ansible_distribution_release == "jessie"
-    - grep_matchuser_ssh.rc != 0
+  - name: "Modify AllowUsers sshd directive for '{{ user.name }}'"
+    replace:
+      dest: /etc/ssh/sshd_config
+      regexp: '^(AllowUsers ((?!\b{{ user.name }}\b).)*)$'
+      replace: '\1 {{ user.name }}'
+      validate: '/usr/sbin/sshd -T -f %s'
+    notify: reload sshd
+    when: grep_allowusers_ssh.rc == 0
 
-- name: "Modify Match User's sshd directive for '{{ user.name }}' (Jessie)"
-  replace:
-    dest: /etc/ssh/sshd_config
-    regexp: '^(Match User ((?!{{ user.name }}).)*)$'
-    replace: '\1,{{ user.name }}'
-    validate: '/usr/sbin/sshd -T -f %s'
-  notify: reload sshd
-  when:
-    - ansible_distribution_release == "jessie"
-    - grep_matchuser_ssh.rc == 0
+  - name: "verify Match User directive"
+    command: "grep 'Match User' /etc/ssh/sshd_config"
+    changed_when: False
+    failed_when: False
+    register: grep_matchuser_ssh
+    check_mode: no
+
+  - name: "Add Match User sshd directive for '{{ user.name }}' (Jessie)"
+    lineinfile:
+      dest: /etc/ssh/sshd_config
+      line: "\nMatch User {{ user.name }}\n    PasswordAuthentication no"
+      insertafter: "# END EVOLINUX PASSWORD RESTRICTIONS BY ADDRESS"
+      validate: '/usr/sbin/sshd -T -f %s'
+    notify: reload sshd
+    when:
+      - ansible_distribution_release == "jessie"
+      - grep_matchuser_ssh.rc != 0
+
+  - name: "Modify Match User's sshd directive for '{{ user.name }}' (Jessie)"
+    replace:
+      dest: /etc/ssh/sshd_config
+      regexp: '^(Match User ((?!{{ user.name }}).)*)$'
+      replace: '\1,{{ user.name }}'
+      validate: '/usr/sbin/sshd -T -f %s'
+    notify: reload sshd
+    when:
+      - ansible_distribution_release == "jessie"
+      - grep_matchuser_ssh.rc == 0
+
+  when: grep_allowgroups_ssh.rc != 0