Add logic for users with same username