Add password handling (refs #3502)