Added fields for username and password