Added popup for service account selection