Fix account class

Fix account class and puppetmaster definitions