refactoring
Merge remote-tracking branch 'origin/feature/email_registration_confirmation' into feature/email_registration_confirmation