More minor changes
Check permissions and edit tokens before
processing form submissions