Remove an extra space
Add user tokens