adding default Client Id and improved flow