Fixing bug with PS 2.0 not being able to use credentials