diff --git a/manifests/autocorr.pp b/manifests/autocorr.pp
new file mode 100644
index 0000000000000000000000000000000000000000..d3b2dd41118db70ed5ac14cea6484a7472986184
--- /dev/null
+++ b/manifests/autocorr.pp
@@ -0,0 +1,28 @@
+class aes::autocorr {
+
+  $autocorr_user = autocorr
+  $autocorr_group = $autocorr_user
+  $autocorr_home = "/home/${autocorr_user}"
+
+  user { 'autocorr' :
+    ensure     => present,
+    managehome => false,
+    membership => inclusive,
+    system     => true,
+    shell      => '/sbin/nologin',
+  }
+
+  file { $autocorr_home:
+    ensure => directory,
+    mode   => '0755',
+    owner  => $autocorr_user,
+    group  => $autocorr_group,
+  }
+
+  file { "${autocorr_home}/.ssh":
+    ensure => directory,
+    mode   => '0700',
+    owner  => $autocorr_user,
+    group  => $autocorr_group,
+  }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index 89032e8aff60196efb82c4d4d2c37b3ce4a52b57..630fce744065348b419c1d5d2da386e1a059deb7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,6 +8,7 @@ class aes {
   include aes::broker
   include aes::auth
   include aes::auth_keydb
+  include aes::autocorr
   include liurepo::centos_sclo_rh
 
   package {