small fixes for always keeping current user at 0