diff --git a/manifests/init.pp b/manifests/init.pp
index 79d9cfa..b36c1c0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,11 +26,11 @@ class etherpad_lite (
   $path = "/usr/local/bin:/usr/bin:/bin:${base_install_dir}/etherpad-lite"
 
   user { $ep_user:
-    shell   => '/usr/sbin/nologin',
-    home    => "${base_log_dir}/${ep_user}",
-    system  => true,
-    gid     => $ep_user,
-    require => Group[$ep_user],
+    shell      => '/usr/sbin/nologin',
+    system     => true,
+    gid        => $ep_user,
+    require    => Group[$ep_user],
+    managehome => true,
   }
 
   group { $ep_user:
@@ -95,11 +95,12 @@ class etherpad_lite (
     path        => $path,
     user        => $ep_user,
     cwd         => "${base_install_dir}/etherpad-lite",
-    environment => "HOME=${base_log_dir}/${ep_user}",
+    environment => "HOME=/home/${ep_user}",
     require     => [
       Package['curl'],
       Vcsrepo["${base_install_dir}/etherpad-lite"],
       Anchor['nodejs-anchor'],
+      User[$ep_user],
     ],
     before      => File["${base_install_dir}/etherpad-lite/settings.json"],
     creates     => "${base_install_dir}/etherpad-lite/node_modules",