Couple extra recipient restrictions

Few extra additions