Added password and username handling.