Prevented adding multiple admins with the same username.
Merge origin/master