Add password two situations and encryption