Refactored before_validation hook into smaller methods
Merge branch 'diogob-user_validation_refactor'