Jeff - refactoring to registration error message logic