add :username, lets allow for either