Added secure disconnects to G and F clients