BZ-8687: Adding PMAccountID handling to client side logic.