Allow client to pass another clientId

Signed-off-by: Tim Smart <tim@fostle.com>
Update app

Signed-off-by: Tim Smart <tim@fostle.com>