Additional cleanup, automatic user adding for admin user