Added hint when trying to re-add users
Minor refactor
Fixed error message