Password Recovery fixes