Still fixing identity dialog