Restore token presence validation
Made token generation consistent

Like in Application, generation of values will only be done if they are
not already set (helpful for fixtures/seed data)