diff --git a/roles/gitea/handlers/main.yml b/roles/gitea/handlers/main.yml
new file mode 100644
index 0000000..84881e7
--- /dev/null
+++ b/roles/gitea/handlers/main.yml
@@ -0,0 +1,19 @@
+#!/usr/bin/ansible-playbook
+# vim:ft=ansible:
+---
+- name: Create default user
+  command:
+    argv:
+      - /usr/local/bin/gitea
+      - admin
+      - create-user
+      - --username
+      - "{{ gitea_admin_username }}"
+      - --password
+      - "{{ gitea_admin_password }}"
+      - --email
+      - "{{ gitea_admin_email }}"
+      - --config
+      - /etc/gitea/app.ini
+  become: yes
+  become_user: git
diff --git a/roles/gitea/tasks/main.yml b/roles/gitea/tasks/main.yml
index a7417c1..bd8ac08 100644
--- a/roles/gitea/tasks/main.yml
+++ b/roles/gitea/tasks/main.yml
@@ -87,21 +87,8 @@
             mode: "0640"
             owner: "root"
             group: "git"
-        - name: Create default user
-          command:
-            argv:
-              - /usr/local/bin/gitea
-              - admin
-              - create-user
-              - --username
-              - "{{ gitea_admin_username }}"
-              - --password
-              - "{{ gitea_admin_password }}"
-              - --email
-              - "{{ gitea_admin_email }}"
-              - --config
-              - /etc/gitea/app.ini
           become_user: git
+          notify: gitea add default user
       when: not p.stat.exists
     - name: Template out service
       template: