[bug 1146802] User should not be prompted to create a token when passing...

... --create-token

@fabianofranz @liggitt @jwforres  please review