#352 Display form + error on token error