Fix: Don't set relationship to active unless it has credentials