Merge "Fix bugs around unification when no password is set"