added optional passwords