squash this commit - if password is nil + test