improve invitation flow