Add default port config and annotate password with password, better error loggning