diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 20cc9fe11..a7c686f51 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -7,7 +7,7 @@ cmake_minimum_required (VERSION 3.4)
 set (SYNERGY_VERSION_MAJOR 1)
 set (SYNERGY_VERSION_MINOR 12)
 set (SYNERGY_VERSION_PATCH 0)
-set (SYNERGY_VERSION_STAGE "rc1")
+set (SYNERGY_VERSION_STAGE "snapshot")
 
 #
 # Version from CI
diff --git a/src/gui/src/ConfigWriter.cpp b/src/gui/src/ConfigWriter.cpp
index 0a98003da..6e039170e 100644
--- a/src/gui/src/ConfigWriter.cpp
+++ b/src/gui/src/ConfigWriter.cpp
@@ -51,9 +51,10 @@ namespace GUI {
                                              QCoreApplication::organizationName(),
                                              QCoreApplication::applicationName());
 
-            m_pSettingsUser = new QSettings(QSettings::Scope::UserScope,
-                                   QCoreApplication::organizationName(),
-                                   QCoreApplication::applicationName());
+            //defaults to user scope, if we set the scope specifically then we also have to set
+            // the application name and the organisation name which breaks backwards compatibility
+            // See #6730
+            m_pSettingsUser = new QSettings();
 
             //Set scope to user for initially
             m_pSettingsCurrent = m_pSettingsUser;