Hello Angel, 

I have recently come up with the same issue as yours as I will be potentially working with a client that worked in the continental U.S for some time but is really considered a bona fide Puerto Rican resident by IRS definitions. I noticed that the ProConnect software that I use doesn't have that option (unless I overlooked it), but I need to make that adjustment as he would be considered a bona fide Puerto Rican resident. I wonder if you came up with a solution to this problem. If you did, I would greatly appreciate it if you let me know. Thanks!