Fix #693 - bad feedback for duplicated users
Fix small bug