Add in use of another credential
Add hostname that are uid-based