Fixed issue with undefined passwords