Resolving secret_token issue