Model updated to accept both username and e-mail