diff --git a/manifests/manage.pp b/manifests/manage.pp
index 5ce7698..ea7d7b9 100644
--- a/manifests/manage.pp
+++ b/manifests/manage.pp
@@ -10,12 +10,13 @@
     ],
     managehome => Boolean,
     password   => Optional[String[0, default]],
+    shell      => Optional[String[2, default]],
     present    => Boolean,
     ssh        => Optional[
       Struct[{
         key       => String[1, default],
         key_label => String[1, default],
-        key_type  => String[7, 7],
+        key_type  => String[7, 11],
       }]
     ],
   }] $userdata
@@ -35,7 +36,10 @@
       false => $userdata['password'],
       true  => '',
     },
-    shell    => '/bin/bash',
+    shell    =>  empty($userdata['shell']) ? {
+      false  => $userdata['shell'],
+      true   => '/bin/bash',
+    },
     groups   => empty($userdata['groups']) ? {
       false  => $userdata['groups'],
       true   => [],
diff --git a/manifests/params.pp b/manifests/params.pp
index d78ba9e..53b6516 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -27,12 +27,13 @@
         ],
         managehome => Boolean,
         password   => Optional[String[0, default]],
+        shell      => Optional[String[2, default]],
         present    => Boolean,
         ssh        => Optional[
           Struct[{
             key       => String[1, default],
             key_label => String[1, default],
-            key_type  => String[7, 7],
+            key_type  => String[7, 11],
           }]
         ],
       }]