Fix for email login
Merge remote-tracking branch 'remotes/github/emailLoginFix'

Conflicts:
	login.php