diff --git a/roles/native-user-administrator/files/administrator b/roles/native-user-administrator/files/administrator
index 122be9da..c8393a55 100644
--- a/roles/native-user-administrator/files/administrator
+++ b/roles/native-user-administrator/files/administrator
@@ -1 +1 @@
-administrator ALL=(ALL:ALL) ALL
+administrator ALL=(ALL) ALL
diff --git a/roles/native-user-administrator/tasks/main.yml b/roles/native-user-administrator/tasks/main.yml
index f3c21c83..ea7890d0 100644
--- a/roles/native-user-administrator/tasks/main.yml
+++ b/roles/native-user-administrator/tasks/main.yml
@@ -4,7 +4,8 @@
     generate_ssh_key: yes
     ssh_key_bits: 4096
     ssh_key_file: .ssh/id_rsa
-    group: administrator
+    update_password: on_create
+    password: "{{ user_administrator_password | password_hash('sha512') }}"
 
 - name: create /home/administrator/.ssh/authorized_keys
   copy: