diff --git a/VERSION b/VERSION
index 0dc6c6039..b856c3df5 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3507"
+BUILD_NUM="3508"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index 8b0f799cc..b3887e9e4 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "4.2.0.3507"
+#define VERSION      "4.2.0.3508"
 #define GENERATION   "4.2"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index e54cc13c3..2083540f3 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 4.2.0.3507
+%define version 4.2.0.3508
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index 9fdef4eeb..68aee8151 100644
--- a/packaging/fwbuilder.control
+++ b/packaging/fwbuilder.control
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
 Priority: extra
 Section: checkinstall
 Maintainer: vadim@fwbuilder.org
-Version: 4.2.0.3507-1
+Version: 4.2.0.3508-1
 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
 Description: Firewall Builder GUI and policy compilers
diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec
index 0226351cc..15c654d34 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 4.2.0.3507
+%define version 4.2.0.3508
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/src/libgui/FWBSettings.cpp b/src/libgui/FWBSettings.cpp
index c5734068f..523822415 100644
--- a/src/libgui/FWBSettings.cpp
+++ b/src/libgui/FWBSettings.cpp
@@ -120,13 +120,16 @@ const char* newFirewallPlatform =
     SETTINGS_PATH_PREFIX "/Objects/NewFireallPlatform";
 const char* newClusterFailoverProtocol =
     SETTINGS_PATH_PREFIX "/Objects/newClusterFailoverProtocol";
-const char* appGUID = SETTINGS_PATH_PREFIX "/ApplicationGUID";
 const char* abTestingGroup = SETTINGS_PATH_PREFIX "/abTestingGroup";
 const char* startsCounter = SETTINGS_PATH_PREFIX "/startsCounter";
 const char* targetStatus = SETTINGS_PATH_PREFIX "/TargetStatus/";
 const char* SSHPath = SETTINGS_PATH_PREFIX "/SSH/SSHPath";
 const char* SCPPath = SETTINGS_PATH_PREFIX "/SSH/SCPPath";
 
+const char* appGUID = "/fwbuilder_gui/ApplicationGUID";
+const char* appGUID_4_0 = "/4.0/ApplicationGUID";
+const char* appGUID_4_1 = "/4.1/ApplicationGUID";
+
 #ifdef _WIN32
 const char* SSHTimeout = "Sessions/fwb_session_with_keepalive/PingIntervalSecs";
 #else
@@ -187,17 +190,26 @@ void FWBSettings::init(bool force_first_time_run)
     ok = uuid_settings->contains(appGUID);
     if (!ok)
     {
-        // migrate uuid from the old native format settings to uuid_settings
-        // See #1497
-        ok = contains(appGUID);
+        ok = uuid_settings->contains(appGUID_4_1);
         if (ok)
         {
-            uuid_settings->setValue(appGUID, value(appGUID).toString());
+            uuid_settings->setValue(
+                appGUID, uuid_settings->value(appGUID_4_1).toString());
+            uuid_settings->remove(appGUID_4_1);
         } else
         {
-            qsrand(time(NULL));
-            uuid_settings->setValue(appGUID, QUuid::createUuid().toString());
-            first_run = true;
+            ok = uuid_settings->contains(appGUID_4_0);
+            if (ok) 
+            {
+                uuid_settings->setValue(
+                    appGUID, uuid_settings->value(appGUID_4_0).toString());
+                uuid_settings->remove(appGUID_4_0);
+            } else
+            {
+                qsrand(time(NULL));
+                uuid_settings->setValue(appGUID, QUuid::createUuid().toString());
+                first_run = true;
+            }
         }
     }