diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp
index da0f383..93d7b7c 100644
--- a/abusesa/manifests/init.pp
+++ b/abusesa/manifests/init.pp
@@ -26,6 +26,17 @@ class abusesa {
         }
     }
 
+    include user::system
+    realize(User["abusesa"], Group["abusesa"])
+
+    file { "/home/abusesa":
+        ensure  => "directory",
+        mode    => "0700",
+        owner   => "abusesa",
+        group   => "abusesa",
+        require => User["abusesa"],
+    }
+
     file { "/usr/local/src/abusesa.tar.gz":
         ensure => present,
         mode   => "0644",
diff --git a/user/manifests/init.pp b/user/manifests/init.pp
index 65e1880..7cbb8be 100644
--- a/user/manifests/init.pp
+++ b/user/manifests/init.pp
@@ -245,6 +245,21 @@ class user::system {
         require => Group["etherpad"],
     }
 
+    # AbuseSA
+    @group { "abusesa":
+        ensure => present,
+        gid    => 817,
+    }
+    @user { "abusesa":
+        ensure  => present,
+        uid     => 817,
+        gid     => 817,
+        comment => "Service AbuseSA",
+        home    => "/home/abusesa",
+        shell   => "/sbin/nologin",
+        require => Group["abusesa"],
+    }
+
 }