Added support for recovery passwords