diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index aa7fcc10c9..2b42bdd67f 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -138,8 +138,8 @@ cassandra:
     default_fetch_size: "${CASSANDRA_DEFAULT_FETCH_SIZE:2000}"
     # Specify partitioning size for timestamp key-value storage. Example MINUTES, HOURS, DAYS, MONTHS
     ts_key_value_partitioning: "${TS_KV_PARTITIONING:MONTHS}"
-    # Specify max partitions per request
-    max_limit_per_request: "${TS_KV_MAX_LIMIT_PER_REQUEST:1000}"
+    # Specify max data points per request
+    max_limit_per_request: "${TS_KV_MAX_LIMIT_PER_REQUEST:86400}"
 
 # Actor system parameters
 actors:
diff --git a/dao/src/main/resources/demo-data.cql b/dao/src/main/resources/demo-data.cql
index 84a1dffce7..cc62b05c32 100644
--- a/dao/src/main/resources/demo-data.cql
+++ b/dao/src/main/resources/demo-data.cql
@@ -287,10 +287,10 @@ VALUES (
 	'org.thingsboard.server.extensions.core.plugin.mail.MailPlugin',
 	true,
 	'{
-       "host": "smtp.gmail.com",
-       "port": 587,
-       "username": "username@gmail.com",
-       "password": "password",
+       "host": "smtp.sendgrid.net",
+       "port": 2525,
+       "username": "apikey",
+       "password": "your_api_key",
        "otherProperties": [
          {
            "key":"mail.smtp.auth",
@@ -303,14 +303,6 @@ VALUES (
          {
            "key":"mail.smtp.starttls.enable",
            "value":"true"
-         },
-         {
-           "key":"mail.smtp.host",
-           "value":"smtp.gmail.com"
-         },
-         {
-           "key":"mail.smtp.port",
-           "value":"587"
          }
        ]
      }'