diff --git a/pillar/users/revokedusers.sls b/pillar/users/revokedusers.sls
index 229bda3..e83476e 100644
--- a/pillar/users/revokedusers.sls
+++ b/pillar/users/revokedusers.sls
@@ -1,19 +1,22 @@
 #   -------------------------------------------------------------
 #   Salt — Revoked users accounts list
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #   Project:        Eglide
 #   Created:        2016-04-10
 #   License:        Trivial work, not eligible to copyright
 #   -------------------------------------------------------------
 
 #   -------------------------------------------------------------
 #   Users accounts
 #   -------------------------------------------------------------
 
 revokedusers:
   # Account renamed to erol // T808
   - fedai
   # Temporary test account // D608, D609
   - amjtest
   # Account renamed to sandlayth // T789
   - kalix
+  # Users who never have connected to Eglide's accounts (SSH key issues)
+  - akoe
+  - tarik
diff --git a/pillar/users/shellusers.sls b/pillar/users/shellusers.sls
index e7d0d30..d594bb2 100644
--- a/pillar/users/shellusers.sls
+++ b/pillar/users/shellusers.sls
@@ -1,83 +1,77 @@
 #   -------------------------------------------------------------
 #   Salt — Users accounts list
 #   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #   Project:        Eglide
 #   Created:        2016-04-08
 #   License:        Trivial work, not eligible to copyright
 #   -------------------------------------------------------------
 
 #   -------------------------------------------------------------
 #   Users accounts
 #   -------------------------------------------------------------
 
 shellusers:
   tomjerr:
     fullname: Tommy Aditya
     uid: 2001
   erol:
     fullname: Erol Unutmaz
     uid: 2002
   rashk0:
     fullname: Rashk0
     uid: 2003
   kazuya:
     fullname: Kazuya
     uid: 2004
   amj:
     fullname: Amaury J.
     uid: 2005
   dereckson:
     fullname: Sebastien Santoro
     {% if grains['os'] == 'FreeBSD' %}
     shell: /bin/tcsh
     {% else %}
     shell: /usr/bin/tcsh
     {% endif %}
     uid: 5001
   sandlayth:
     fullname: Yassine Hadj Messaoud
     uid: 5002
   shark:
     fullname: Shark
     uid: 2006
   rix:
     fullname: Rix
     uid: 2007
   kumkum:
     fullname: Kumkum
     uid: 2008
   chan:
     fullname: Chanel
     uid: 2009
   ringa:
     fullname: Ringa
     uid: 2010
   xray:
     fullname: xray
     uid: 2011
   c2c:
     fullname: c2c
     {% if grains['os'] == 'FreeBSD' %}
     shell: /usr/local/bin/fish
     {% else %}
     shell: /usr/bin/fish
     {% endif %}
     uid: 2012
   rama:
     fullname: Rama
     uid: 2013
   thrx:
     fullname: ThrX
     uid: 2014
-  akoe:
-    fullname: akoe
-    uid: 2015
-  tarik:
-    fullname: tarik
-    uid: 2016
   xcombelle:
     fullname: xcombelle
     uid: 2017
   hlp:
     fullname: hlp
     uid: 2018
diff --git a/roles/shellserver/users/files/ssh_keys/akoe b/roles/shellserver/users/files/ssh_keys/akoe
deleted file mode 100644
index 5fba19b..0000000
--- a/roles/shellserver/users/files/ssh_keys/akoe
+++ /dev/null
@@ -1,22 +0,0 @@
-#   -------------------------------------------------------------
-#   OpenSSH authorized_keys
-#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#   Project:        Eglide
-#   License:        Trivial work, not eligible to copyright
-#   Source file:    roles/shellserver/users/files/ssh_keys/akoe
-#   -------------------------------------------------------------
-#
-#   <auto-generated>
-#       This file is managed by our rOPS SaltStack repository.
-#
-#       Changes to this file may cause incorrect behavior
-#       and will be lost if the state is redeployed.
-#
-#       To add a new key or revoke a key, submit a Git commit:
-#       https://agora.nasqueron.org/How_to_contribute_code
-#
-#       You can also ask Nasqueron operations to do that for you:
-#       https://devcentral.nasqueron.org/maniphest/task/edit/form/3/
-#   </auto-generated>
-
-ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAuy5F8SzjzRj8xL9ssxeBHWDrpbPzWS3K2SoCgco6xNW1tW3r5NfFFKl1SGhNwcmf3QOWVcb9VzkcS3bqSjosq79bCRKph5Wg2tWym18EjrDGhCYa3rxorkrvE/qE+WlTDMCtY98fyLmFUTazpqCW0ZF9xvUpk4LCjO/zVWqXc+XQjk0DRlmDCFliPANggTn4yTbXGqPsvUyHwb6Ge7GJSKzr/Lz7gJCY0kLXCAFN211FmPr9VrYJSfLu66Kv79UmDv9bCgmWuG8+VAaUWgCVVB9VrEet9lHjAPQwXxfNJ5jVtfxb4Oxw/L8A1ew7hG8sTX1ku8bAjbsa07/w9N6c2w== rsa-key-20170228
diff --git a/roles/shellserver/users/files/ssh_keys/tarik b/roles/shellserver/users/files/ssh_keys/tarik
deleted file mode 100644
index f0b7d98..0000000
--- a/roles/shellserver/users/files/ssh_keys/tarik
+++ /dev/null
@@ -1,22 +0,0 @@
-#   -------------------------------------------------------------
-#   OpenSSH authorized_keys
-#   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-#   Project:        Eglide
-#   License:        Trivial work, not eligible to copyright
-#   Source file:    roles/shellserver/users/files/ssh_keys/tarik
-#   -------------------------------------------------------------
-#
-#   <auto-generated>
-#       This file is managed by our rOPS SaltStack repository.
-#
-#       Changes to this file may cause incorrect behavior
-#       and will be lost if the state is redeployed.
-#
-#       To add a new key or revoke a key, submit a Git commit:
-#       https://agora.nasqueron.org/How_to_contribute_code
-#
-#       You can also ask Nasqueron operations to do that for you:
-#       https://devcentral.nasqueron.org/maniphest/task/edit/form/3/
-#   </auto-generated>
-
-ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAlrm/htNZrM5UUkqRqnp11npk7gK1aB3sKu/dh1x0VimQJqSDq9FY91XcFEftsuLdBu+NHF0qgpLDCrJK8xbrSRo659SAp8JQLL668ZlvJJXhcPtWfNjapkQ7cXcMFMz8y5EjD6KXV4ub2Ry9Onp9AU27i0BDR3cPB9yzLl4Fjw+A/2nYd3mUzyBvZyADpC0vhwTIefoWo4ORL9LR2L0BP7rTtQ98yiHiBdyFIFA2uxSGlqCQGOnOYo32PFWlH9wdDpm3mPKKxGMfzh/ynjsZ6g1hM6HEJBa/j9FDaOKvBK0d2M86/eMKASA5gix7Dzd422JbmEFF14xWCbUDl/IgQw== rsa-key-20170407