Fix User validation