Merge "Move users to system dashboard"