User valid check reversion fixes