Fix behavior when first creating user