diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 67d516ba5..0df8279f1 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -63,25 +63,6 @@ SET(RYZOM_VERSION_MAJOR 3)
 SET(RYZOM_VERSION_MINOR 5)
 SET(RYZOM_VERSION_PATCH 0)
 
-SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL")
-SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL")
-SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL")
-SET(RYZOM_CLIENT_PATCH_URL           "https://cdn.ryzom.dev/open/patch/" CACHE STRING "Ryzom Client Patch URL")
-
-SET(RYZOM_WEBIG_MAIN_URL             "https://open.ryzom.dev/" CACHE STRING "Ryzom Client WebIG Main URL")
-SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "open.ryzom.dev" CACHE STRING "Ryzom Client WebIG Trusted Domain")
-
-# urls when compiling ryzom live client
-IF(WITH_RYZOM_LIVE)
-  SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://account.ryzom.com/signup/from_client.php")
-  SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://account.ryzom.com/payment_profile/index.php")
-  SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://account.ryzom.com/payment_profile/lost_secure_password.php")
-  SET(RYZOM_CLIENT_PATCH_URL           "http://dl.ryzom.com/patch_live")
-
-  SET(RYZOM_WEBIG_MAIN_URL             "https://app.ryzom.com/")
-  SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "app.ryzom.com")
-ENDIF()
-
 #-----------------------------------------------------------------------------
 # Redirect output files
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -115,6 +96,29 @@ NL_SETUP_BUILD_FLAGS()
 NL_SETUP_PREFIX_PATHS()
 RYZOM_SETUP_PREFIX_PATHS()
 
+#-----------------------------------------------------------------------------
+# Default values for URL's
+SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Create Account URL")
+SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Edit Account URL")
+SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://open.ryzom.dev/ams/" CACHE STRING "Ryzom Client Forget Password URL")
+SET(RYZOM_CLIENT_PATCH_URL           "https://cdn.ryzom.dev/open/patch/" CACHE STRING "Ryzom Client Patch URL")
+
+SET(RYZOM_WEBIG_MAIN_URL             "https://open.ryzom.dev/" CACHE STRING "Ryzom Client WebIG Main URL")
+SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "open.ryzom.dev" CACHE STRING "Ryzom Client WebIG Trusted Domain")
+
+#-----------------------------------------------------------------------------
+# urls when compiling ryzom live client
+IF(WITH_RYZOM_LIVE)
+  MESSAGE("Using RYZOM_LIVE urls")
+  SET(RYZOM_CLIENT_CREATE_ACCOUNT_URL  "https://account.ryzom.com/signup/from_client.php")
+  SET(RYZOM_CLIENT_EDIT_ACCOUNT_URL    "https://account.ryzom.com/payment_profile/index.php")
+  SET(RYZOM_CLIENT_FORGET_PASSWORD_URL "https://account.ryzom.com/payment_profile/lost_secure_password.php")
+  SET(RYZOM_CLIENT_PATCH_URL           "http://dl.ryzom.com/patch_live")
+
+  SET(RYZOM_WEBIG_MAIN_URL             "https://app.ryzom.com/")
+  SET(RYZOM_WEBIG_TRUSTED_DOMAIN       "app.ryzom.com")
+ENDIF()
+
 #-----------------------------------------------------------------------------
 #Platform specifics