BRANCH 4.1: added provision for where password for admin is NULL