diff --git a/README.md b/README.md
index 2ab0710..a8a6e5f 100644
--- a/README.md
+++ b/README.md
@@ -252,7 +252,7 @@ node 'splunk-cidx1.internal.corp.tld',
 
 ### Example 5
 
-Enabling Single Sign-On through Active Directory Federation Services (ADFS) as an Identity provider, on a search head:
+Enabling Single Sign-On through Active Directory Federation Services (ADFS) as an Identity provider:
 
 ```
 node 'splunk-sh.internal.corp.tld' {
@@ -266,12 +266,12 @@ node 'splunk-sh.internal.corp.tld' {
 }
 ```
 
-And then on the ADFS side:
+On the ADFS side:
 
 1. Add a new Relying Party Trust, by importing the XML from `https://splunk-sh.internal.corp.tld/saml/spmetadata`. Since this metadata is kept behind a Splunk login, you'll have to:
 
-    - first browse to https://splunk-sh.internal.corp.tld/account/login?loginType=Splunk
-    - then browse to https://splunk-sh.internal.corp.tld/saml/spmetadata, and copy/paste the SAML metadata XML to the Windows server. 
+    - first browse to `https://splunk-sh.internal.corp.tld/account/login?loginType=Splunk`
+    - then browse to `https://splunk-sh.internal.corp.tld/saml/spmetadata`, and copy/paste the SAML metadata XML to the Windows server. 
     - import the SAML metadata XML from the relying party (Splunk) from a file
 
 1. Add 3 new claim descriptions for:
@@ -282,12 +282,16 @@ And then on the ADFS side:
 
    ![ADFS claim descriptions for Splunk](adfs_claim_descriptions.png)
 
-1. Add new claim rules, using the new claim descriptions created above:
+1. Add a new claim rule to map Active Directory attributes to the new claim descriptions created above:
    
    ![ADFS get attributes claim rule for Splunk](adfs_claim_rules_get_attrs.png)
 
+1. Add a new claim rule to map Domain Admins to the `role` claim attribute:
+
    ![ADFS map admins claim rule for Splunk](adfs_claim_rule_group_membership_admins.png)
 
+1. Add a new claim rule to map Domain Users to the `role` claim attribute:
+
    ![ADFS map users claim rule for Splunk](adfs_claim_rule_group_membership_users.png)
 
    The rules overview should look something like this:
@@ -301,7 +305,6 @@ And then on the ADFS side:
 1. `Set-ADFSRelyingPartyTrust -TargetIdentifier host10.testlab.local -SignedSamlRequestsRequired $False`, otherwise you'll find messages like these in the Windows Eventlog: `System.NotSupportedException: ID6027: Enveloped Signature Transform cannot be the last transform in the chain.`
 
 For some reason the ADFS side doesn't like the AuthnRequests that Splunk sends, so `signAuthnRequest = false` is set in Splunk if you use `idptype => 'ADFS'`.
-And on the ADFS server:
 
 Logout doesn't work by the way, throws this error:
 
diff --git a/manifests/authentication.pp b/manifests/authentication.pp
index a7c9fe9..d86a063 100644
--- a/manifests/authentication.pp
+++ b/manifests/authentication.pp
@@ -5,6 +5,7 @@
   $authType = $splunk::authtype,
   $idptype = $splunk::idptype,
   $idpurl = $splunk::idpurl,
+  $rolemap_SAML = $splunk::rolemap_SAML,
 ){
   case $authType {
     'Splunk':    {
@@ -30,7 +31,11 @@
           $idpCertPath                = "${splunk_home}/etc/auth/idpcert.crt"
           $signAuthnRequest           = false
           $signedAssertion            = true
-          $redirectPort               = $splunk::httpport }
+          $redirectPort               = $splunk::httpport
+          $rolemap_SAML_admin         = $rolemap_SAML[admin]
+          $rolemap_SAML_power         = $rolemap_SAML[power]
+          $rolemap_SAML_user          = $rolemap_SAML[user]
+        }        
         default:    {
           fail 'Unsupported Identity Provider' }
       }
@@ -51,9 +56,11 @@
           "set saml_settings/redirectPort ${redirectPort}",
           "set saml_settings/signAuthnRequest ${signAuthnRequest}",
           "set saml_settings/signedAssertion ${signedAssertion}",
+          "set rolemap_SAML/admin '${rolemap_SAML_admin}'",
+          "set rolemap_SAML/power '${rolemap_SAML_power}'",
+          "set rolemap_SAML/user '${rolemap_SAML_user}'",
         ],
       }
     }
   }
 }
-
diff --git a/manifests/init.pp b/manifests/init.pp
index 3f40c8b..f26617f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -87,6 +87,7 @@
   $authtype     = $splunk::params::authtype,
   $idptype      = $splunk::params::idptype,
   $idpurl       = $splunk::params::idpurl,
+  $rolemap_SAML = $splunk::params::rolemap_SAML,
   ) inherits splunk::params {
 
   if $type == 'uf' {
diff --git a/manifests/params.pp b/manifests/params.pp
index a5753c5..0092142 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -33,5 +33,6 @@
   $authtype    = 'Splunk'
   $idptype     = undef
   $idpurl      = undef
+  $rolemap_SAML = { 'admin' => 'Domain Admins', 'power' => 'Power Users', 'user' => 'Domain Users'}
 }