diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile
index 91dca24..b06ecb8 100644
Binary files a/EAPMethods/MSIBuild/Makefile and b/EAPMethods/MSIBuild/Makefile differ
diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp
index 4e28968..b062a2d 100644
--- a/EAPMethods/src/Main.cpp
+++ b/EAPMethods/src/Main.cpp
@@ -651,7 +651,7 @@ DWORD WINAPI EapPeerGetMethodProperties(
         *ppEapError = NULL;
 
     // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532)
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
         return dwResult = ERROR_NOT_SUPPORTED;
     if (!pConnectionData && dwConnectionDataSize || !pUserData && dwUserDataSize || !pMethodPropertyArray)
         return dwResult = ERROR_INVALID_PARAMETER;
@@ -699,7 +699,7 @@ DWORD WINAPI EapPeerCredentialsXml2Blob(
         *ppEapError = NULL;
 
     // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532)
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
         return dwResult = ERROR_NOT_SUPPORTED;
     if (!pCredentialsDoc || !pConnectionData && dwConnectionDataSize || !ppCredentialsOut || !pdwCredentialsOutSize)
         return dwResult = ERROR_INVALID_PARAMETER;
@@ -751,7 +751,7 @@ DWORD WINAPI EapPeerQueryCredentialInputFields(
         *ppEapError = NULL;
 
     // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532)
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
         return dwResult = ERROR_NOT_SUPPORTED;
     if (!pConnectionData && dwConnectionDataSize || !pEapConfigInputFieldsArray)
         return dwResult = ERROR_INVALID_PARAMETER;
@@ -797,7 +797,7 @@ DWORD WINAPI EapPeerQueryUserBlobFromCredentialInputFields(
         *ppEapError = NULL;
 
     // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532)
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
         return dwResult = ERROR_NOT_SUPPORTED;
     if (!pConnectionData && dwConnectionDataSize || !pEapConfigInputFieldArray || !pdwUsersBlobSize || !ppUserBlob)
         return dwResult = ERROR_INVALID_PARAMETER;
diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/src/Main_UI.cpp
index dc22130..cfcaee5 100644
--- a/EAPMethods/src/Main_UI.cpp
+++ b/EAPMethods/src/Main_UI.cpp
@@ -130,7 +130,7 @@ DWORD WINAPI EapPeerConfigXml2Blob(
         *ppEapError = NULL;
 
     // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532)
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
         return dwResult = ERROR_NOT_SUPPORTED;
     if (!pConfigDoc || !pConnectionDataOut || !pdwConnectionDataOutSize)
         return dwResult = ERROR_INVALID_PARAMETER;
@@ -185,7 +185,7 @@ DWORD WINAPI EapPeerConfigBlob2Xml(
         *ppEapError = NULL;
 
     // Parameter check
-    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532)
+    if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID)
         return dwResult = ERROR_NOT_SUPPORTED;
     if (!pConnectionData && dwConnectionDataSize || !ppConfigDoc)
         return dwResult = ERROR_INVALID_PARAMETER;
@@ -265,7 +265,7 @@ DWORD WINAPI EapPeerInvokeConfigUI(
     // Parameter check
     if (!pEapType || !pConnectionDataIn && dwConnectionDataInSize || !pdwConnectionDataOutSize || !ppConnectionDataOut)
         return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != 67532)
+    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != EAPMETHOD_AUTHOR_ID)
         return dwResult = ERROR_NOT_SUPPORTED;
 
     try {
@@ -319,7 +319,7 @@ DWORD WINAPI EapPeerInvokeIdentityUI(
     // Parameter check
     if (!pEapType || !pConnectionData && dwConnectionDataSize || !pUserData && dwUserDataSize || !pdwUserDataOutSize || !ppUserDataOut || !ppwszIdentity)
         return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != 67532)
+    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != EAPMETHOD_AUTHOR_ID)
         return dwResult = ERROR_NOT_SUPPORTED;
 
     try {
@@ -367,7 +367,7 @@ DWORD WINAPI EapPeerInvokeInteractiveUI(
     // Parameter check
     if (!pEapType || !pUIContextData && dwUIContextDataSize || !pdwDataFromInteractiveUISize || !ppDataFromInteractiveUI)
         return dwResult = ERROR_INVALID_PARAMETER;
-    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != 67532)
+    if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != EAPMETHOD_AUTHOR_ID)
         return dwResult = ERROR_NOT_SUPPORTED;
 
     try {
diff --git a/Makefile b/Makefile
index d47087a..932ebd0 100644
Binary files a/Makefile and b/Makefile differ
diff --git a/MakefileEAPMethod.mak b/MakefileEAPMethod.mak
index aac57c7..b0d5ab3 100644
Binary files a/MakefileEAPMethod.mak and b/MakefileEAPMethod.mak differ
diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak
index 6ee2a5e..56b045e 100644
Binary files a/include/MSIBuildCfg.mak and b/include/MSIBuildCfg.mak differ
diff --git a/include/Version.h b/include/Version.h
index a350cc3..e36938a 100644
--- a/include/Version.h
+++ b/include/Version.h
@@ -75,3 +75,8 @@
 // developing it, make it easily customizable.
 //
 #define PRODUCT_NAME_STR         "GÉANTLink"
+
+//
+// EAPHost author ID
+//
+#define EAPMETHOD_AUTHOR_ID        67532
diff --git a/lib/EAPBase/src/Module.cpp b/lib/EAPBase/src/Module.cpp
index 99c9824..fc22e62 100644
--- a/lib/EAPBase/src/Module.cpp
+++ b/lib/EAPBase/src/Module.cpp
@@ -63,7 +63,7 @@ EAP_ERROR* eap::module::make_error(_In_ DWORD dwErrorCode, _In_opt_z_ LPCWSTR ps
     pError->type.eapType.type         = (BYTE)m_eap_method;
     pError->type.eapType.dwVendorId   = 0;
     pError->type.eapType.dwVendorType = 0;
-    pError->type.dwAuthorId           = 67532;
+    pError->type.dwAuthorId           = EAPMETHOD_AUTHOR_ID;
     pError->dwReasonCode              = dwReasonCode;
     pError->rootCauseGuid             = pRootCauseGuid != NULL ? *pRootCauseGuid : GUID_NULL;
     pError->repairGuid                = pRepairGuid    != NULL ? *pRepairGuid    : GUID_NULL;