Only store principal if the token is signed
Fixing some systests