Updated so that even the saltmaster gets it's key accepted