Moving this check from frontend to backend
Moving this check from frontend to backend