eAM Re-Builadable Work Orders - Completion Subinventory is not mandatory in R12

 Dear All,

We have a problem in R12.1.3 eAM re-buildable work orders completion. 

In 11i, completion subinventory is mandatory at the time of work order completion, so analyst will give completion subinventory and system creates on-hnad qty for re-buildable item.

In R12, completion subinventory is not mandatory and analyst may miss this at the time of completion, in this scenario system is not creating inventory. 

Is there a way to make this mandatory for Re-Buildable work orders? We tried to do OAF personalization but this is making completion subinventory required for all type of work orders. 

Please help me here.