Fix for empty RWGPS accounts