Added password issue, also some fixes