RPV-333

Fixed logic for admin user add where email exists for user in same unit (was causing 404), refactored code