diff --git a/roles/init/defaults/main.yml b/roles/init/defaults/main.yml
index ec17194..677d5cd 100644
--- a/roles/init/defaults/main.yml
+++ b/roles/init/defaults/main.yml
@@ -14,6 +14,7 @@ pleroma_defaults:
     remotePostRetentionDays: 90
     logLevel: info
     federating: "true"
+    chatEnabled: "true"
     mrf:
       simplePolicy:
         reject: []
diff --git a/roles/pleroma-main/handlers/main.yml b/roles/pleroma-main/handlers/main.yml
new file mode 100644
index 0000000..5744a0e
--- /dev/null
+++ b/roles/pleroma-main/handlers/main.yml
@@ -0,0 +1,4 @@
+- name: restart pleroma
+  service:
+    name: pleroma
+    state: restarted
diff --git a/roles/pleroma-main/tasks/main.yml b/roles/pleroma-main/tasks/main.yml
index ce27373..84ec917 100644
--- a/roles/pleroma-main/tasks/main.yml
+++ b/roles/pleroma-main/tasks/main.yml
@@ -140,6 +140,7 @@
     find /tmp/release/ -mindepth 1 -maxdepth 1 | xargs -I dir mv dir {{ pleroma_user.home }}
   args:
     creates: "{{ pleroma_user.home }}/bin/pleroma"
+  notify: "restart pleroma"
   when: enable_pleroma_installation is defined
 
 - name: Ensuring the configuration file is set.
@@ -149,6 +150,7 @@
     owner: "{{ pleroma_user.name }}"
     group: "{{ pleroma_user.group }}"
     mode: '0400'
+  notify: "restart pleroma"
 
 - name: Running database migrations.
   command:
@@ -171,6 +173,7 @@
     owner: "{{ pleroma_user.name }}"
     group: "{{ pleroma_user.group }}"
     mode: '0400'
+  notify: "restart pleroma"
   when: pleroma.config.frontend.background|length
 
 - name: Ensuring that the custom themes are uploaded.
@@ -198,12 +201,12 @@
     owner: root
     group: root
     mode: '0700'
+  notify: "restart pleroma"
 
-- name: Ensuring that the Pleroma service is enabled and started.
+- name: Ensuring that the Pleroma service is enabled.
   service:
     name: pleroma
     enabled: yes
-    state: started
 
 - name: Cleaning up
   file:
diff --git a/roles/pleroma-main/templates/etc_pleroma_config.exs.j2 b/roles/pleroma-main/templates/etc_pleroma_config.exs.j2
index a701c91..5137302 100644
--- a/roles/pleroma-main/templates/etc_pleroma_config.exs.j2
+++ b/roles/pleroma-main/templates/etc_pleroma_config.exs.j2
@@ -110,3 +110,5 @@ config :pleroma, :mrf_simple,
     "{{ item }}"{{ "," if not loop.last else "" }}
   {% endfor %}
   ]
+
+config :pleroma, :chat, enabled: {{ pleroma.config.chatEnabled }}