diff --git a/accounts/gmail/gmailsettings.cpp b/accounts/gmail/gmailsettings.cpp
index a50668b8..fc0177bf 100644
--- a/accounts/gmail/gmailsettings.cpp
+++ b/accounts/gmail/gmailsettings.cpp
@@ -1,55 +1,63 @@
 /*
     Copyright (c) 2016 Christian Mollekopf <mollekopf@kolabsys.com>
 
     This library is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published by
     the Free Software Foundation; either version 2 of the License, or (at your
     option) any later version.
 
     This library is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
     License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
 #include "gmailsettings.h"
 
 GmailSettings::GmailSettings(QObject *parent)
     : AccountSettings(parent)
 {
 }
 
 void GmailSettings::load()
 {
     loadAccount();
     loadImapResource();
     loadMailtransportResource();
     loadIdentity();
 }
 
 void GmailSettings::save()
 {
     mImapServer = "imaps://imap.gmail.com:993";
     mImapUsername = mEmailAddress;
 
     mSmtpServer = "smtps://smtp.gmail.com:587";
     mSmtpUsername = mEmailAddress;
 
+    mCardDavServer = QStringLiteral("https://www.googleapis.com/carddav/v1/principals/") + mEmailAddress + "/";
+    mCardDavUsername = mEmailAddress;
+
+    mCalDavServer = QStringLiteral("https://www.google.com/calendar/dav/") + mEmailAddress + "/";
+    mCalDavUsername = mEmailAddress;
+
     saveAccount();
     saveImapResource();
     saveMailtransportResource();
+    saveCardDavResource();
+    saveCalDavResource();
     saveIdentity();
 }
 
 void GmailSettings::remove()
 {
     removeResource(mMailtransportIdentifier);
     removeResource(mImapIdentifier);
     removeIdentity();
     removeAccount();
 }
 
diff --git a/accounts/gmail/metadata.json b/accounts/gmail/metadata.json
index 68c06971..0ad786f1 100644
--- a/accounts/gmail/metadata.json
+++ b/accounts/gmail/metadata.json
@@ -1,4 +1,4 @@
 {
-    "Name": "GMail",
+    "Name": "Google",
     "RequiresKeyring": true
 }
diff --git a/accounts/gmail/qml/AccountSettings.qml b/accounts/gmail/qml/AccountSettings.qml
index d7df5eaf..f93ad4a7 100644
--- a/accounts/gmail/qml/AccountSettings.qml
+++ b/accounts/gmail/qml/AccountSettings.qml
@@ -1,92 +1,92 @@
 /*
   Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
   Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsys.com>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License along
   with this program; if not, write to the Free Software Foundation, Inc.,
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import org.kube.framework 1.0 as Kube
 import org.kube.accounts.gmail 1.0 as GmailAccount
 
 Item {
 
     property string accountId
-    property string heading: qsTr("Connect your GMail account")
+    property string heading: qsTr("Connect your Google account")
     property string subheadline: qsTr("To let Kube access your account, fill in email address, username and give the account a title that will be displayed inside Kube.")
     property bool valid: true
     implicitHeight: grid.implicitHeight
 
     GmailAccount.GmailSettings {
         id: gmailSettings
         accountIdentifier: accountId
         accountType: "gmail"
     }
 
     function save(){
         gmailSettings.save()
     }
 
     function remove(){
         gmailSettings.remove()
     }
 
     GridLayout {
         id: grid
         anchors.fill: parent
         columns: 2
         columnSpacing: Kube.Units.largeSpacing
         rowSpacing: Kube.Units.largeSpacing
 
         Kube.Label {
-            text: "Please note that GMail requires you to configure your account to allow IMAP connections from Kube:
+            text: "Please note that Google requires you to configure your account to allow IMAP connections from Kube:
 <ol type=''>
 <li> See <a href='https://support.google.com/mail/answer/7126229'>https://support.google.com/mail/answer/7126229</a> to configure your account to allow IMAP connections.
 <li> Visit <a href='https://myaccount.google.com/lesssecureapps'>https://myaccount.google.com/lesssecureapps</a> and enable the setting to allow Kube to connect to your account."
             Layout.alignment: Qt.AlignCenter
             Layout.columnSpan: 2
             textFormat: Text.StyledText
         }
 
         Kube.Label {
             text: qsTr("Name")
             Layout.alignment: Qt.AlignRight
         }
         Kube.TextField {
             Layout.fillWidth: true
             placeholderText: qsTr("Your name")
             text: gmailSettings.userName
             onTextChanged: {
                 gmailSettings.userName = text
             }
         }
 
         Kube.Label {
             text: qsTr("Email address")
             Layout.alignment: Qt.AlignRight
         }
         Kube.TextField {
             Layout.fillWidth: true
 
             text: gmailSettings.emailAddress
             onTextChanged: {
                 gmailSettings.emailAddress = text
                 gmailSettings.accountName = text
             }
             placeholderText: qsTr("Your email address")
         }
     }
 }