Move credentials clear to connection