Added validations to recovery