diff --git a/local.yml b/local.yml
index 4e07739..e73c830 100644
--- a/local.yml
+++ b/local.yml
@@ -21,6 +21,7 @@
     - include: tasks/general/acct_mgmt/users.yml
     - include: tasks/general/acct_mgmt/sudo.yml
     - include: tasks/general/acct_mgmt/keys.yml
+      when: ansible_distribution != "Debian"
     - include: tasks/general/acct_mgmt/mounts.yml
 
     - include: tasks/general/cron/ansible.yml
diff --git a/tasks/general/acct_mgmt/keys.yml b/tasks/general/acct_mgmt/keys.yml
index 07910c0..1aca209 100644
--- a/tasks/general/acct_mgmt/keys.yml
+++ b/tasks/general/acct_mgmt/keys.yml
@@ -4,8 +4,6 @@
 - name: Create Root's SSH Key
   openssh_keypair:
     path: /root/.ssh/id_rsa
-  when: ansible_distribution != "Debian"
 
 - name: Join System to 1337 Share
-  shell: ssh-copy-id -f -i /root/.ssh/id_rsa ling@leet
-  when: ansible_distribution != "Debian"
\ No newline at end of file
+  shell: ssh-copy-id -f -i /root/.ssh/id_rsa ling@leet
\ No newline at end of file
diff --git a/tasks/general/acct_mgmt/users.yml b/tasks/general/acct_mgmt/users.yml
index 63e99e9..f6b9eea 100644
--- a/tasks/general/acct_mgmt/users.yml
+++ b/tasks/general/acct_mgmt/users.yml
@@ -20,4 +20,4 @@
     shell: /bin/bash
     create_home: yes
     generate_ssh_key: yes
-    password: "{{ ling_passwd }}"
+    #password: "{{ ling_passwd }}"