Added ability to skip default credential checking