Registration form - handle error on email sending
Merge remote-tracking branch 'upstream/master'