Email-login activated
Merge commit '88ac5bca890c24e8aa29bcb25e39c29794aa9c1f'