fixing clientId and admin Id