diff --git a/Daemon.cpp b/Daemon.cpp
index 81bbcdd5..2a32ff04 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -189,6 +189,7 @@ namespace i2p
 
 			std::string family; i2p::config::GetOption("family", family);
 			i2p::context.SetFamily (family);
+			i2p::context.SetFamilyString (family);
 			if (family.length () > 0)
 				LogPrint(eLogInfo, "Daemon: family set to ", family);	
 			
diff --git a/RouterContext.cpp b/RouterContext.cpp
index 4cdf13fe..bc1f3fc1 100644
--- a/RouterContext.cpp
+++ b/RouterContext.cpp
@@ -149,6 +149,14 @@ namespace i2p
 		UpdateRouterInfo ();
 	}
 
+	void RouterContext::SetFamilyString (const std::string& family)
+	{
+		if (family.length() > 0)
+			m_FamilyString = family;
+		else
+			m_FamilyString = "<undefined>";
+	}
+
 	std::string RouterContext::GetFamilyString () const
 	{
 		return m_FamilyString;
@@ -157,15 +165,9 @@ namespace i2p
 	void RouterContext::SetFamily (const std::string& family)
 	{
 
-		m_FamilyString = family;
-		if (m_FamilyString.length() == 0)
-			m_FamilyString = "<undefined>";
-
 		std::string signature;
 		if (family.length () > 0)
-		{
 			signature = i2p::data::CreateFamilySignature (family, GetIdentHash ());
-		}
 		if (signature.length () > 0)
 		{
 			m_RouterInfo.SetProperty (i2p::data::ROUTER_INFO_PROPERTY_FAMILY, family);
diff --git a/RouterContext.h b/RouterContext.h
index 1b0f7ed2..def89383 100644
--- a/RouterContext.h
+++ b/RouterContext.h
@@ -59,6 +59,7 @@ namespace i2p
 			bool IsFloodfill () const { return m_IsFloodfill; };	
 			void SetFloodfill (bool floodfill);	
 			void SetFamily (const std::string& family);
+			void SetFamilyString (const std::string& family);
 			std::string GetFamilyString () const;
 			void SetBandwidth (int limit); /* in kilobytes */
 			void SetBandwidth (char L); /* by letter */