Added password and disconnect features