Fix for blank credentials