Improve org otp check