Fix for two-stage transfers and sitename based credentials