diff --git a/manifests/client/config/user.pp b/manifests/client/config/user.pp
index 6b3d234..6a2ef5e 100644
--- a/manifests/client/config/user.pp
+++ b/manifests/client/config/user.pp
@@ -1,59 +1,60 @@
 #
 # Copyright (c) IN2P3 Computing Centre, IN2P3, CNRS
 # Contributor: Remi Ferrand <remi{dot}ferrand_at_cc(dot)in2p3.fr> (2015)
 # Contributor: Tim Meusel <tim@bastelfreak.de> (2017)
 #
 define ssh::client::config::user(
   Enum['present', 'absent']      $ensure              = present,
   Optional[Stdlib::Absolutepath] $target              = undef,
   Optional[Stdlib::Absolutepath] $user_home_dir       = undef,
   Boolean                        $manage_user_ssh_dir = true,
-  Hash $options                                       = {}
+  Hash $options                                       = {},
+  String[1] $user                                     = $name,
 )
 {
 
   include ::ssh::params
 
   # If a specific target file was specified,
   # it must have higher priority than any
   # other parameter.
   if ($target != undef) {
     $_target = $target
   }
   else {
     if ($user_home_dir == undef) {
-      $_user_home_dir = "/home/${name}"
+      $_user_home_dir = "/home/${user}"
     }
     else {
       $_user_home_dir = $user_home_dir
     }
 
     $user_ssh_dir = "${_user_home_dir}/.ssh"
     $_target      = "${user_ssh_dir}/config"
 
     if ($manage_user_ssh_dir == true) {
       unless defined(File[$user_ssh_dir]) {
         file { $user_ssh_dir:
           ensure => directory,
-          owner  => $name,
+          owner  => $user,
           mode   => $::ssh::params::user_ssh_directory_default_mode,
           before => Concat_file[$_target],
         }
       }
     }
   }
 
   unless defined(Concat_file[$_target]) {
     concat_file{$_target:
       ensure => $ensure,
-      owner  => $name,
+      owner  => $user,
       mode   => $::ssh::params::user_ssh_config_default_mode,
       tag    => $name,
     }
   }
   concat_fragment{$name:
     tag     => $name,
     content => template("${module_name}/ssh_config.erb"),
     target  => $_target,
   }
 }