Implement correct enable/disable behavior for client side