diff --git a/AUTHORS b/AUTHORS
index a648d5382..74af17c6f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,6 +14,7 @@ Carlos Cesario <carloscesario@gmail.com>
 Christian Harke <ch.harke@gmail.com>
 Christian Jonak <christian@jonak.org>
 Christian Lehmann <christian_lehmann@gmx.de>
+Claudio Kuenzler <ck@claudiokuenzler.com>
 Claudio Künzler <ck@claudiokuenzler.com>
 Daniil Yaroslavtsev <dyaroslavtsev@confyrm.com>
 David Beck <techiscool@gmail.com>
diff --git a/doc/7-icinga-template-library.md b/doc/7-icinga-template-library.md
index 919b41309..65060966a 100644
--- a/doc/7-icinga-template-library.md
+++ b/doc/7-icinga-template-library.md
@@ -1762,6 +1762,7 @@ mongodb_database                 | **Optional.** Specify the database to check
 mongodb_alldatabases             | **Optional.** Check all databases (action database_size)
 mongodb_ssl                      | **Optional.** Connect using SSL
 mongodb_replicaset               | **Optional.** Connect to replicaset
+mongodb_replcheck                | **Optional.** If set to true, will enable the mongodb_replicaset value needed for "replica_primary" check
 mongodb_querytype                | **Optional.** The query type to check [query|insert|update|delete|getmore|command] from queries_per_second
 mongodb_collection               | **Optional.** Specify the collection to check
 mongodb_sampletime               | **Optional.** Time used to sample number of pages faults
diff --git a/itl/plugins-contrib.d/databases.conf b/itl/plugins-contrib.d/databases.conf
index 6b265ec68..fc40093ca 100644
--- a/itl/plugins-contrib.d/databases.conf
+++ b/itl/plugins-contrib.d/databases.conf
@@ -363,7 +363,8 @@ object CheckCommand "mongodb" {
 			description = "Connect using SSL"
 		}
 		"--replicaset" = {
-			set_if = "$mongodb_replicaset$"
+			value = "$mongodb_replicaset$"
+			set_if = "$mongodb_replcheck$"
 			description = "Connect to replicaset"
 		}
 		"--all-databases" = {