diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a1f2d20
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,20 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+# Indentation for all Yaml files
+[*.yml]
+indent_style = space
+indent_size = 2
+
+# Indentation for all Ansible template files
+[*.j2]
+indent_style = space
+indent_size = 4
diff --git a/roles/base/handlers/main.yml b/roles/base/handlers/main.yml
index 517c91e..7ba03e2 100644
--- a/roles/base/handlers/main.yml
+++ b/roles/base/handlers/main.yml
@@ -1,3 +1,5 @@
 ---
 - name: restart paccache
   service: name=paccache.timer state=restarted
+- name: stop systemd per-user instance
+  service: name="user@{{ user.uid }}" state=stopped
diff --git a/roles/base/tasks/user.yml b/roles/base/tasks/user.yml
index 257f394..eeb5fc1 100644
--- a/roles/base/tasks/user.yml
+++ b/roles/base/tasks/user.yml
@@ -20,3 +20,14 @@
   when: user.log.dir is defined
   tags:
     - user
+
+- name: Create user socket directory
+  file: path=/run/user/{{ user.uid }} state=directory owner={{ user.name }} group={{ user.group }} mode=0700
+  tags:
+    - user
+
+- name: Start user systemd instance
+  service: name="user@{{ user.uid }}" state=started
+  notify: stop systemd per-user instance
+  tags:
+    - user