Add support for opening the popup when focusing
Remove display of the client id