Add support for user tokens
Remove secure token on user. (not needed for now)