r20098: Properly fix issues with create_token_from_username()