Bug 1022682 - Added csrf protection