Reverted back to unconditionalised api_user_url - more research needed.