Fix empty user information being populated