clean up condition error; include username and pass