Fix add existing user, code refactoring.