CLOUD-216 separate credentials related angular logic