diff --git a/win-linux/package/windows/common.iss b/win-linux/package/windows/common.iss
index 13c850d8d..ec74c442a 100644
--- a/win-linux/package/windows/common.iss
+++ b/win-linux/package/windows/common.iss
@@ -969,7 +969,7 @@ begin
     end;
 
     if CheckCommandlineParam('/noassocheck') then begin
-      RegWriteStringValue(HKEY_CURRENT_USER, ExpandConstant('{#APP_REG_PATH}'), 'ignoreAssocMsg', 'true');
+      RegWriteStringValue(HKEY_LOCAL_MACHINE, ExpandConstant('{#APP_REG_PATH}'), 'ignoreAssocMsg', 'true');
     end;
 
   end else
diff --git a/win-linux/src/platform_win/association.cpp b/win-linux/src/platform_win/association.cpp
index b6f206faf..d0c88ea1d 100644
--- a/win-linux/src/platform_win/association.cpp
+++ b/win-linux/src/platform_win/association.cpp
@@ -134,8 +134,9 @@ void Association::AssociationPrivate::DialogSchedule::addToSchedule(const std::w
 
 Association::AssociationPrivate::AssociationPrivate() : m_pDialogSchedule(new DialogSchedule(this))
 {
+    GET_REGISTRY_SYSTEM(reg_system)
     GET_REGISTRY_USER(reg_user)
-    m_ignoreAssocMsg = reg_user.value("ignoreAssocMsg", false).toBool() || IsPackage(Portable);
+    m_ignoreAssocMsg = reg_system.value("ignoreAssocMsg", false).toBool() || reg_user.value("ignoreAssocMsg", false).toBool() || IsPackage(Portable);
     if (!m_ignoreAssocMsg)
         m_lastCheck = time_t(reg_user.value("lastAssocCheck", 0).toLongLong());