diff --git a/DVMHost.vcxproj b/DVMHost.vcxproj
index 380e603c..b0b5d572 100644
--- a/DVMHost.vcxproj
+++ b/DVMHost.vcxproj
@@ -314,6 +314,7 @@
       <FileType>Document</FileType>
     </CopyFileToFolders>
     <None Include="cpp.hint" />
+    <None Include="iden_channel_calc.py" />
     <None Include="Makefile" />
     <None Include="Makefile.arm" />
     <None Include="Makefile.rpi-arm" />
diff --git a/DVMHost.vcxproj.filters b/DVMHost.vcxproj.filters
index 02838de9..25cdafd9 100644
--- a/DVMHost.vcxproj.filters
+++ b/DVMHost.vcxproj.filters
@@ -574,6 +574,7 @@
     <None Include="Makefile.arm" />
     <None Include="Makefile.rpi-arm" />
     <None Include="cpp.hint" />
+    <None Include="iden_channel_calc.py" />
   </ItemGroup>
   <ItemGroup>
     <CopyFileToFolders Include="iden_table.dat" />
diff --git a/host/Host.cpp b/host/Host.cpp
index b2d69d74..9ef58b95 100644
--- a/host/Host.cpp
+++ b/host/Host.cpp
@@ -1183,6 +1183,13 @@ bool Host::readParams()
     m_identity = systemConf["identity"].as<std::string>();
     m_fixedMode = systemConf["fixedMode"].as<bool>(false);
 
+    if (m_identity.length() > 8) {
+        std::string identity = m_identity;
+        m_identity = identity.substr(0, 8);
+
+        ::LogWarning(LOG_HOST, "System Identity \"%s\" is too long; truncating to 8 characters, \"%s\".", identity.c_str(), m_identity.c_str());
+    }
+
     removeLockFile();
 
     LogInfo("General Parameters");