fix: refacto react-hook-form logic for roles based organizations

fix: refacto react-hook-form logic for roles based organizations #1417