diff --git a/manifests/aes_sw.pp b/manifests/aes_sw.pp
index 9071cb6d6dc249874d93d55d82a0fa87515615f8..30236506927a6913539d7186df1327d577f4bb37 100644
--- a/manifests/aes_sw.pp
+++ b/manifests/aes_sw.pp
@@ -1,5 +1,13 @@
 class aes::aes_sw {
 
+  package {
+    [
+      'a2ps',
+      'java-11-openjdk-devel',
+    ]:
+      ensure  => installed,
+  }
+
   user { "examadm" :
     ensure => present,
     managehome => false,
@@ -8,4 +16,29 @@ class aes::aes_sw {
     shell => '/sbin/nologin',
   }
 
+  file { "/etc/systemd/system/aes_login.service":
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode => '0644',
+    content => @(LOGINSERVICE)
+    [Unit]
+    Description=AES Login server
+    After=network.target
+    
+    [Service]
+    Type=simple
+    User=examadm
+    WorkingDirectory=/home/examadm/Version-3.1/exam
+    ExecStart=/usr/bin/python3 /home/examadm/Version-3.1/pub/bin/examiner/find_pnr_and_otp_from_liuid.py
+
+    [Install]
+    WantedBy=multi-user.target
+    | LOGINSERVICE
+  }
+
+  service { "aes_login" : 
+    ensure => "running",
+  }
+
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 058eb02ead0081a4897cd3e3c0e42e3e8d38d652..96355b397903c51325a7a6df568b1d46bf2f64e6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,7 +7,6 @@ class aes {
   package {
     [
       'devtoolset-7',
-      'java-11-openjdk-devel',
       'python36',
     ]:
       ensure  => installed,