Fix user idneity bugs.