diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index 00054460e..8cb2e408f 100644
--- a/lib/db_ido/hostdbobject.cpp
+++ b/lib/db_ido/hostdbobject.cpp
@@ -138,6 +138,7 @@ Dictionary::Ptr HostDbObject::GetStatusFields(void) const
 		fields->Set("output", attrs->Get("plugin_output"));
 		fields->Set("long_output", attrs->Get("long_plugin_output"));
 		fields->Set("perfdata", attrs->Get("performance_data"));
+		fields->Set("check_source", attrs->Get("check_source"));
 		fields->Set("current_state", attrs->Get("current_state"));
 		fields->Set("has_been_checked", attrs->Get("has_been_checked"));
 		fields->Set("should_be_scheduled", attrs->Get("should_be_scheduled"));
diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
index 6164cb7f7..16267276a 100644
--- a/lib/db_ido/servicedbobject.cpp
+++ b/lib/db_ido/servicedbobject.cpp
@@ -149,6 +149,7 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const
 	fields->Set("output", attrs->Get("plugin_output"));
 	fields->Set("long_output", attrs->Get("long_plugin_output"));
 	fields->Set("perfdata", attrs->Get("performance_data"));
+	fields->Set("check_source", attrs->Get("check_source"));
 	fields->Set("current_state", attrs->Get("current_state"));
 	fields->Set("has_been_checked", attrs->Get("has_been_checked"));
 	fields->Set("should_be_scheduled", attrs->Get("should_be_scheduled"));
diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 7dcb94cfe..ac5451755 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -336,7 +336,7 @@ void Service::SetCheckResultAuthority(const String& authority)
 String Service::GetCheckResultAuthority(void) const
 {
 	if (m_CheckResultAuthority.IsEmpty())
-		return "(local)";
+		return "(i2 local)";
 	else
 		return m_CheckResultAuthority;
 }