Revert "Single User Issue"

This reverts commit dd619df6d06e840c014a1449a5d263cb9623af24.