fix confirmation after sign in. start to fix organization