Data-init corrections and active company field check for new user