diff --git a/config/config.go b/config/config.go
index 2619d0e95..422906a6f 100644
--- a/config/config.go
+++ b/config/config.go
@@ -163,9 +163,9 @@ func (self *CGRConfig) setDefaults() error {
 	self.DBDataEncoding = utils.MSGPACK
 	self.RPCEncoding = JSON
 	self.DefaultReqType = utils.RATED
-	self.DefaultTOR = "0"
-	self.DefaultTenant = "0"
-	self.DefaultSubject = "0"
+	self.DefaultTOR = "call"
+	self.DefaultTenant = "cgrates.org"
+	self.DefaultSubject = "cgrates"
 	self.RoundingMethod = utils.ROUNDING_MIDDLE
 	self.RoundingDecimals = 4
 	self.RaterEnabled = false
diff --git a/config/config_test.go b/config/config_test.go
index 6b1b69304..99ddbf056 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -67,9 +67,9 @@ func TestDefaults(t *testing.T) {
 	eCfg.DBDataEncoding = utils.MSGPACK
 	eCfg.RPCEncoding = JSON
 	eCfg.DefaultReqType = utils.RATED
-	eCfg.DefaultTOR = "0"
-	eCfg.DefaultTenant = "0"
-	eCfg.DefaultSubject = "0"
+	eCfg.DefaultTOR = "call"
+	eCfg.DefaultTenant = "cgrates.org"
+	eCfg.DefaultSubject = "cgrates"
 	eCfg.RoundingMethod = utils.ROUNDING_MIDDLE
 	eCfg.RoundingDecimals = 4
 	eCfg.RaterEnabled = false
diff --git a/data/conf/cgrates.cfg b/data/conf/cgrates.cfg
index db0189649..61bd81c86 100644
--- a/data/conf/cgrates.cfg
+++ b/data/conf/cgrates.cfg
@@ -26,9 +26,9 @@
 # dbdata_encoding = msgpack			# The encoding used to store object data in strings: <msgpack|json>
 # rpc_encoding = json 				# RPC encoding used on APIs: <gob|json>.
 # default_reqtype = rated			# Default request type to consider when missing from requests: <""|prepaid|postpaid|pseudoprepaid|rated>.
-# default_tor = 0				# Default Type of Record to consider when missing from requests.
-# default_tenant = 0				# Default Tenant to consider when missing from requests.
-# default_subject = 0				# Default rating Subject to consider when missing from requests.
+# default_tor = call				# Default Type of Record to consider when missing from requests.
+# default_tenant = cgrates.org			# Default Tenant to consider when missing from requests.
+# default_subject = cgrates			# Default rating Subject to consider when missing from requests.
 # rounding_method = *middle			# Rounding method for floats/costs: <*up|*middle|*down>
 # rounding_decimals = 4				# Number of decimals to round float/costs at