Settings tokens from Janne
Small fixes to admin tokens