Update Account.php

Sign In form only has 'login' and 'password' fields, no 'username' or 'email' fields exist.  Took out lines that want those form field values and fixed validation rule to work with either 'username' or 'email' UserSettings::LOGIN_* value.

Can now login again regardless of the setting on the backend.