Updated with username and password