Updated user change query to show default option