Fixed issue with labels and added a guard for duplicate users