Fixed bug where ClientID wasnt saving sometimes