Merge pull request #106 from yjbanov/init-clientId

make clientId available immediately