diff --git a/manifests/params.pp b/manifests/params.pp
index 467c5934..8a47b137 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -18,13 +18,14 @@
 
   case $::osfamily {
     'RedHat': {
-      $etc_directory    = '/etc'
-      $root_group       = 'root'
-      $group            = 'nobody'
-      $link_openssl_cnf = true
-      $pam_module_path = '/usr/lib64/openvpn/plugin/lib/openvpn-auth-pam.so'
+      $etc_directory       = '/etc'
+      $root_group          = 'root'
+      $group               = 'nobody'
+      $link_openssl_cnf    = true
+      $pam_module_path     = '/usr/lib64/openvpn/plugin/lib/openvpn-auth-pam.so'
       $additional_packages = ['easy-rsa']
-      $easyrsa_source = '/usr/share/easy-rsa/2.0'
+      $easyrsa_source      = '/usr/share/easy-rsa/2.0'
+      $namespecific_rclink = false
 
       # Redhat/Centos >= 7.0
       if(versioncmp($::operatingsystemrelease, '7.0') >= 0) and $::operatingsystem != 'Amazon' {
@@ -37,53 +38,54 @@
       $ldap_auth_plugin_location = undef # no ldap plugin on redhat/centos
     }
     'Debian': { # Debian/Ubuntu
-      $etc_directory     = '/etc'
-      $root_group        = 'root'
-      $group             = 'nogroup'
-      $link_openssl_cnf  = true
-      $pam_module_path   = '/usr/lib/openvpn/openvpn-auth-pam.so'
+      $etc_directory       = '/etc'
+      $root_group          = 'root'
+      $group               = 'nogroup'
+      $link_openssl_cnf    = true
+      $pam_module_path     = '/usr/lib/openvpn/openvpn-auth-pam.so'
+      $namespecific_rclink = false
 
       case $::operatingsystem {
         'Debian': {
           # Version > 8.0, jessie
           if(versioncmp($::operatingsystemrelease, '8.0') >= 0) {
-            $additional_packages = ['easy-rsa','openvpn-auth-ldap']
-            $easyrsa_source = '/usr/share/easy-rsa/'
+            $additional_packages       = ['easy-rsa','openvpn-auth-ldap']
+            $easyrsa_source            = '/usr/share/easy-rsa/'
             $ldap_auth_plugin_location = '/usr/lib/openvpn/openvpn-auth-ldap.so'
-            $systemd = true
+            $systemd                   = true
 
           # Version > 7.0, wheezy
           } elsif(versioncmp($::operatingsystemrelease, '7.0') >= 0) {
-            $additional_packages = ['openvpn-auth-ldap']
-            $easyrsa_source = '/usr/share/doc/openvpn/examples/easy-rsa/2.0'
+            $additional_packages       = ['openvpn-auth-ldap']
+            $easyrsa_source            = '/usr/share/doc/openvpn/examples/easy-rsa/2.0'
             $ldap_auth_plugin_location = '/usr/lib/openvpn/openvpn-auth-ldap.so'
-            $systemd = false
+            $systemd                   = false
           } else {
-            $additional_packages = undef
-            $easyrsa_source = '/usr/share/doc/openvpn/examples/easy-rsa/2.0'
+            $additional_packages       = undef
+            $easyrsa_source            = '/usr/share/doc/openvpn/examples/easy-rsa/2.0'
             $ldap_auth_plugin_location = undef
-            $systemd = false
+            $systemd                   = false
           }
         }
         'Ubuntu': {
           # Version > 15.04, vivid
           if(versioncmp($::operatingsystemrelease, '15.04') >= 0){
-            $additional_packages = ['easy-rsa','openvpn-auth-ldap']
-            $easyrsa_source = '/usr/share/easy-rsa/'
+            $additional_packages       = ['easy-rsa','openvpn-auth-ldap']
+            $easyrsa_source            = '/usr/share/easy-rsa/'
             $ldap_auth_plugin_location = '/usr/lib/openvpn/openvpn-auth-ldap.so'
-            $systemd = true
+            $systemd                   = true
 
           # Version > 13.10, saucy
           } elsif(versioncmp($::operatingsystemrelease, '13.10') >= 0) {
-            $additional_packages = ['easy-rsa','openvpn-auth-ldap']
-            $easyrsa_source = '/usr/share/easy-rsa/'
+            $additional_packages       = ['easy-rsa','openvpn-auth-ldap']
+            $easyrsa_source            = '/usr/share/easy-rsa/'
             $ldap_auth_plugin_location = '/usr/lib/openvpn/openvpn-auth-ldap.so'
-            $systemd = false
+            $systemd                   = false
           } else {
-            $additional_packages = undef
-            $easyrsa_source = '/usr/share/doc/openvpn/examples/easy-rsa/2.0'
+            $additional_packages       = undef
+            $easyrsa_source            = '/usr/share/doc/openvpn/examples/easy-rsa/2.0'
             $ldap_auth_plugin_location = undef
-            $systemd = false
+            $systemd                   = false
           }
         }
         default: {
@@ -98,21 +100,23 @@
       $easyrsa_source            = '/usr/share/easy-rsa/'
       $group                     = 'nobody'
       $ldap_auth_plugin_location = undef # unsupported
-      $link_openssl_cnf = true
-      $systemd = true
+      $link_openssl_cnf          = true
+      $systemd                   = true
+      $namespecific_rclink       = false
     }
     'Linux': {
       case $::operatingsystem {
         'Amazon': {
-          $etc_directory       = '/etc'
-          $root_group          = 'root'
-          $group               = 'nobody'
-          $additional_packages = ['easy-rsa']
-          $easyrsa_source = '/usr/share/easy-rsa/2.0'
+          $etc_directory             = '/etc'
+          $root_group                = 'root'
+          $group                     = 'nobody'
+          $additional_packages       = ['easy-rsa']
+          $easyrsa_source            = '/usr/share/easy-rsa/2.0'
           $ldap_auth_plugin_location = undef
-          $systemd = false
-          $link_openssl_cnf = true
-          $pam_module_path = '/usr/lib/openvpn/openvpn-auth-pam.so'
+          $systemd                   = false
+          $link_openssl_cnf          = true
+          $pam_module_path           = '/usr/lib/openvpn/openvpn-auth-pam.so'
+          $namespecific_rclink       = false
         }
         default: {
           fail("Unsupported OS/Distribution ${::osfamily}/${::operatingsystem}")