improving credentials passing