Fixes #1853 Allow login via email and/or username with settings in the ACP
Also added some missing messages