Fix for incomplete credentials