On 12 February 1944, the tender returned to San Diego, where her crew set up a submarine training school in conjunction with the Navy's West Coast Sound School. "Beaver" remained at San Diego — tending S-boats during training operations — until late June 1945. Ordered into drydock for conversion to an internal combustion engine repair ship, she was redesignated ARG-19 on 25 June 1945. Following two months of repair and conversion, she departed San Diego on 28 August for duty with the service force in occupied Japan. The ship remained in Japanese waters — tending the multitude of small craft in use by the Navy — until March, 1946, when she crossed the China Sea and steamed up the Yangtze River in China and then on to the Huangpu River where she remained until May,1946. She then returned to the west coast, anchoring in Puget Sound, in the state of Washington.I served aboard the Beaver during her voyage through the Pacific, to Okinawa,Japan and China.