Fix updateUser + mailCheck
Manual Merge