Null user fix