changed ID/password to Username/Email