Merge pull request #5694 from Wikia/UC-99-part2

UC-99 actually save user settings when confirming email