diff --git a/config/config.json b/config/config.json
index 5469608f8e..fff45b9e6f 100644
--- a/config/config.json
+++ b/config/config.json
@@ -54,7 +54,11 @@
         "AmazonS3AccessKeyId": "",
         "AmazonS3SecretAccessKey": "",
         "AmazonS3Bucket": "",
-        "AmazonS3Region": ""
+        "AmazonS3Region": "",
+        "AmazonS3Endpoint": "",
+        "AmazonS3BucketEndpoint": "",
+        "AmazonS3LocationConstraint": false,
+        "AmazonS3LowercaseBucket": false
     },
     "EmailSettings": {
         "EnableSignUpWithEmail": true,
@@ -99,5 +103,28 @@
         "AuthEndpoint": "",
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
+    },
+    "GoogleSettings": {
+        "Enable": false,
+        "Secret": "",
+        "Id": "",
+        "Scope": "",
+        "AuthEndpoint": "",
+        "TokenEndpoint": "",
+        "UserApiEndpoint": ""
+    },
+    "LdapSettings": {
+        "Enable": false,
+        "LdapServer": null,
+        "LdapPort": 389,
+        "BaseDN": null,
+        "BindUsername": null,
+        "BindPassword": null,
+        "FirstNameAttribute": null,
+        "LastNameAttribute": null,
+        "EmailAttribute": null,
+        "UsernameAttribute": null,
+        "IdAttribute": null,
+        "QueryTimeout": 60
     }
-}
+}
\ No newline at end of file
diff --git a/utils/mail.go b/utils/mail.go
index ece4105a67..6625060de8 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -98,12 +98,12 @@ func SendMail(to, subject, body string) *model.AppError {
 }
 
 func SendMailUsingConfig(to, subject, body string, config *model.Config) *model.AppError {
-	l4g.Debug("sending mail to " + to + " with subject of '" + subject + "'")
-
 	if !config.EmailSettings.SendEmailNotifications || len(config.EmailSettings.SMTPServer) == 0 {
 		return nil
 	}
 
+	l4g.Debug("sending mail to " + to + " with subject of '" + subject + "'")
+
 	fromMail := mail.Address{config.EmailSettings.FeedbackName, config.EmailSettings.FeedbackEmail}
 	toMail := mail.Address{"", to}