Tokens should be compared with User::matchEditToken

Change-Id: I17cf911a11ea31c2c3eb5f1ffc3e1012d6a968e0