diff --git a/group_vars/clients.yml.sample b/group_vars/clients.yml.sample
index c259e15ad..301c37238 100644
--- a/group_vars/clients.yml.sample
+++ b/group_vars/clients.yml.sample
@@ -11,7 +11,7 @@ dummy:
 # GENERAL #
 ###########
 
-#fetch_directory: fetch/
+#copy_admin_key: false
 
 #user_config: false
 #pools:
diff --git a/roles/ceph-client/defaults/main.yml b/roles/ceph-client/defaults/main.yml
index d5adf0188..4a18e81a2 100644
--- a/roles/ceph-client/defaults/main.yml
+++ b/roles/ceph-client/defaults/main.yml
@@ -3,7 +3,7 @@
 # GENERAL #
 ###########
 
-fetch_directory: fetch/
+copy_admin_key: false
 
 user_config: false
 pools:
diff --git a/roles/ceph-client/tasks/pre_requisite.yml b/roles/ceph-client/tasks/pre_requisite.yml
index 788df130c..7c40f4ccd 100644
--- a/roles/ceph-client/tasks/pre_requisite.yml
+++ b/roles/ceph-client/tasks/pre_requisite.yml
@@ -6,7 +6,9 @@
     owner: "ceph"
     group: "ceph"
     mode: "0600"
-  when: cephx
+  when:
+    - cephx
+    - copy_admin_key
 
 - name: check if global key exists in ceph_conf_overrides
   set_fact: