Update & create user fix