Fix role-based access:
Note, this changes how the control modules are generated
AND uses a PREFIX when importing the non-User modules