Fix user handling code
Add in the Deploykey handling for get checkouts by Puppet