Added logging in by email as wells as username