diff --git a/roles/wiki_js/tasks/main.json b/roles/wiki_js/tasks/main.json
index 7a62c22..117202d 100644
--- a/roles/wiki_js/tasks/main.json
+++ b/roles/wiki_js/tasks/main.json
@@ -98,34 +98,6 @@
 			"cmd": "npm rebuild sqlite3"
 		}
 	},
-	{
-		"name": "initialize",
-		"become": true,
-		"become_user": "{{var_wiki_js_user}}",
-		"ansible.builtin.command": {
-			"chdir": "{{var_wiki_js_directory}}",
-			"cmd": "node cli.js init {{var_wiki_js_admin_email_address}} {{var_wiki_js_admin_password}} https://{{var_wiki_js_domain}} 0"
-		}
-	},
-	{
-		"name": "email settings",
-		"become": true,
-		"become_user": "{{var_wiki_js_user}}",
-		"ansible.builtin.command": {
-			"chdir": "{{var_wiki_js_directory}}",
-			"cmd": "node cli.js email-settings-set {{var_wiki_js_smtp_host}} {{var_wiki_js_smtp_port}} {{var_wiki_js_smtp_username}} {{var_wiki_js_smtp_password}} {{email_sending_sender_name}} {{email_sending_sender_email_address}}"
-		}
-	},
-	{
-		"name": "authentication | authelia",
-		"when": "var_wiki_js_authentication_kind == 'authelia'",
-		"become": true,
-		"become_user": "{{var_wiki_js_user}}",
-		"ansible.builtin.command": {
-			"chdir": "{{var_wiki_js_directory}}",
-			"cmd": "node cli.js auth-strat-add-oauth2 {{var_wiki_js_authentication_data_authelia_provider_id}} {{var_wiki_js_authentication_data_authelia_provider_name}} {{var_wiki_js_authentication_data_authelia_client_id}} {{var_wiki_js_authentication_data_authelia_client_secret}} {{var_wiki_js_authentication_data_authelia_url_base}}/api/oidc/authorization {{var_wiki_js_authentication_data_authelia_url_base}}/api/oidc/token {{var_wiki_js_authentication_data_authelia_url_base}}/api/oidc/userinfo"
-		}
-	},
 	{
 		"name": "systemd-unit",
 		"become": true,
@@ -142,5 +114,33 @@
 			"enabled": true,
 			"name": "wiki_js"
 		}
+	},
+	{
+		"name": "initialize",
+		"become": true,
+		"become_user": "{{var_wiki_js_user}}",
+		"ansible.builtin.command": {
+			"chdir": "{{var_wiki_js_directory}}",
+			"cmd": "node cli.js -b https://{{var_wiki_js_domain}} init {{var_wiki_js_admin_email_address}} {{var_wiki_js_admin_password}} https://{{var_wiki_js_domain}} 0"
+		}
+	},
+	{
+		"name": "email settings",
+		"become": true,
+		"become_user": "{{var_wiki_js_user}}",
+		"ansible.builtin.command": {
+			"chdir": "{{var_wiki_js_directory}}",
+			"cmd": "node cli.js -b https://{{var_wiki_js_domain}} -u admin -p {{var_wiki_js_admin_password}} email-settings-set {{var_wiki_js_smtp_host}} {{var_wiki_js_smtp_port}} {{var_wiki_js_smtp_username}} {{var_wiki_js_smtp_password}} {{email_sending_sender_name}} {{email_sending_sender_email_address}}"
+		}
+	},
+	{
+		"name": "authentication | authelia",
+		"when": "var_wiki_js_authentication_kind == 'authelia'",
+		"become": true,
+		"become_user": "{{var_wiki_js_user}}",
+		"ansible.builtin.command": {
+			"chdir": "{{var_wiki_js_directory}}",
+			"cmd": "node cli.js -b https://{{var_wiki_js_domain}} -u admin -p {{var_wiki_js_admin_password}}  auth-strat-add-oauth2 {{var_wiki_js_authentication_data_authelia_provider_id}} {{var_wiki_js_authentication_data_authelia_provider_name}} {{var_wiki_js_authentication_data_authelia_client_id}} {{var_wiki_js_authentication_data_authelia_client_secret}} {{var_wiki_js_authentication_data_authelia_url_base}}/api/oidc/authorization {{var_wiki_js_authentication_data_authelia_url_base}}/api/oidc/token {{var_wiki_js_authentication_data_authelia_url_base}}/api/oidc/userinfo"
+		}
 	}
 ]