Fix for "back" button behavior with clientId