Fix catalog, add default password support