Fix credentials overwriting