resolving conflicts for no password supplied