Fix for non-g+ accounts