moved user control to master db