Users app merge fixes