Updated user and shortened timeout for switch query