Adding Client ID to samples app, improving default flow