-refactored addAppUserFromForm to be more readable/smaller
-fixed broken test