Fix secret_token stuff