RPV-333
Fixed logic for admin user add where email exists for user in same unit (was causing 404), refactored code
Merge pull request #63 from PatientView/bug/RPV-333

RPV-333