diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b4cb4d..2b7bb84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.1.2
+
+* Added Ubunut 18.04 support
+
 ## 0.1.1
 
 * added **shadow::filemodes** to manage group- and passwd- file mode
diff --git a/manifests/init.pp b/manifests/init.pp
index ed1b9ed..37adb6d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,8 +3,6 @@
               $package_ensure = 'installed',
             ) inherits shadow::params{
 
-  validate_re($package_ensure, [ '^present$', '^installed$', '^absent$', '^purged$', '^held$', '^latest$' ], 'Not a supported package_ensure: present/absent/purged/held/latest')
-
   class { '::shadow::install': }
   -> class { '::shadow::config': }
   -> Class['::shadow']
diff --git a/manifests/logindefs.pp b/manifests/logindefs.pp
index f6b1037..5064163 100644
--- a/manifests/logindefs.pp
+++ b/manifests/logindefs.pp
@@ -28,8 +28,6 @@
       {
         /^[6-7].*$/:
         {
-          $package_name='shadow-utils'
-          $maildir_default = '/var/spool/mail'
         }
         default: { fail("Unsupported RHEL/CentOS version! - ${::operatingsystemrelease}")  }
       }
@@ -44,7 +42,6 @@
           {
             /^1[468].*$/:
             {
-              fail('not implemented')
             }
             default: { fail("Unsupported Ubuntu version! - ${::operatingsystemrelease}")  }
           }
diff --git a/manifests/params.pp b/manifests/params.pp
index 689fe4d..6fcf025 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -21,12 +21,12 @@
   {
     'redhat':
     {
+      $package_name='shadow-utils'
+      $maildir_default = '/var/spool/mail'
       case $::operatingsystemrelease
       {
         /^[5-6].*$/:
         {
-          $package_name='shadow-utils'
-          $maildir_default = '/var/spool/mail'
           $sys_uid_min_default = undef
           $sys_uid_max_default = undef
           $sys_gid_min_default = undef
@@ -34,8 +34,6 @@
         }
         /^7.*$/:
         {
-          $package_name='shadow-utils'
-          $maildir_default = '/var/spool/mail'
           $sys_uid_min_default = '201'
           $sys_uid_max_default = '999'
           $sys_gid_min_default = '201'
@@ -52,10 +50,10 @@
         {
           case $::operatingsystemrelease
           {
-            /^1[4-7].*$/:
+            /^1[468].*$/:
             {
-              $package_name='passwd'
-              $maildir_default = '/var/spool/mail'
+              $package_name=[ 'passwd', 'login' ]
+              $maildir_default = '/var/mail'
               #TODO sys_gid_min_default ...
             }
             default: { fail("Unsupported Ubuntu version! - ${::operatingsystemrelease}")  }
diff --git a/metadata.json b/metadata.json
index 6d0c4c1..56c8e0e 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "eyp-shadow",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": "eyp",
   "summary": "manages useradd and login.defs defaults",
   "license": "Apache-2.0",
@@ -34,7 +34,7 @@
     },
     {
       "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [ "14.04", "16.04" ]
+      "operatingsystemrelease": [ "14.04", "16.04", "18.04" ]
     },
     {
       "operatingsystem": "SLES",