- [CFO] Fixed UAC prompt bug

- [CFO] Some code reordering and fixes