Added additional check of client_id to auth flow