Move users to common and setup security