Fix error on completely new user joining