Added duplicate username handling