diff --git a/providers/google.provider.in b/providers/google.provider.in
--- a/providers/google.provider.in
+++ b/providers/google.provider.in
@@ -21,22 +21,15 @@
                order to return a refresh token -->
           <setting name="ResponseType">code</setting>
           <setting name="Scope" type="as">[
-              'https://docs.google.com/feeds/',
-              'https://www.googleapis.com/auth/googletalk',
-              'https://www.googleapis.com/auth/youtube.upload',
-              'https://www.googleapis.com/auth/youtube',
               'https://www.googleapis.com/auth/userinfo.email',
               'https://www.googleapis.com/auth/userinfo.profile',
-              'https://picasaweb.google.com/data/',
               'https://www.googleapis.com/auth/calendar',
-              'https://www.google.com/m8/feeds/',
               'https://www.googleapis.com/auth/tasks',
+              'https://www.google.com/m8/feeds/',
               'https://www.googleapis.com/auth/drive',
-              'https://www.googleapis.com/auth/drive.file',
-              'https://www.googleapis.com/auth/drive.metadata.readonly',
-              'https://www.googleapis.com/auth/drive.readonly'
+              'https://www.googleapis.com/auth/youtube.upload',
           ]</setting>
-          <setting name="AllowedSchemes" type="as">['https','http']</setting>
+          <setting name="AllowedSchemes" type="as">['https']</setting>
           <setting name="ClientId">317066460457-pkpkedrvt2ldq6g2hj1egfka2n7vpuoo.apps.googleusercontent.com</setting>
           <setting name="ClientSecret">Y8eFAaWfcanV3amZdDvtbYUq</setting>
           <setting name="ForceClientAuthViaRequestBody" type="b">true</setting>
diff --git a/services/disabled/google-calendar.service.in b/services/google-calendar.service.in
rename from services/disabled/google-calendar.service.in
rename to services/google-calendar.service.in
--- a/services/disabled/google-calendar.service.in
+++ b/services/google-calendar.service.in
@@ -7,4 +7,10 @@
   <icon>google-calendars</icon>
   <provider>google</provider>
   <translations>kaccounts-providers</translations>
+
+  <template>
+    <group name="akonadi">
+      <setting name="agentType">akonadi_googlecalendar_resource</setting>
+    </group>
+  </template>
 </service>
diff --git a/services/disabled/google-contacts.service.in b/services/google-contacts.service.in
rename from services/disabled/google-contacts.service.in
rename to services/google-contacts.service.in
--- a/services/disabled/google-contacts.service.in
+++ b/services/google-contacts.service.in
@@ -7,4 +7,10 @@
   <icon>google-contacts</icon>
   <provider>google</provider>
   <translations>kaccounts-providers</translations>
-</service>
\ No newline at end of file
+
+  <template>
+    <group name="akonadi">
+      <setting name="agentType">akonadi_googlecontacts_resource</setting>
+    </group>
+  </template>
+</service>