MODULES-1119 Fixed to now have username and passwords passed in again