diff --git a/bin/conf/PseuWoW.conf.default b/bin/conf/PseuWoW.conf.default
index 71efdb8..8c33b8f 100644
--- a/bin/conf/PseuWoW.conf.default
+++ b/bin/conf/PseuWoW.conf.default
@@ -74,8 +74,19 @@ charname=Pseuwow
 
 
 // Client emulation configuration
-ClientVersion=3.3.5
-ClientBuild=12340
+// Client 0: Classic WoW 1.12.2 Build 6005
+// Client 1: TBC 2.4.3  Build 8606
+// Client 2: WoTLK 3.3.5 Build 12340
+// Client 3: Cata 4.x.x Build XXX NOT IMPLEMENTED
+// !!!! 
+// !!!! WARNING!!!! For all of the above Client Version and Client Build are IGNORED
+// !!!!
+// Client 9: Custom Settings for Client Version and Client Build
+Client=0
+// Uncomment if you use Client=9
+// ClientVersion=3.3.5
+// ClientBuild=12340
+
 ClientLanguage=enGB
 // or change to enGB, deDE, ...
 
diff --git a/src/Client/PseuWoW.cpp b/src/Client/PseuWoW.cpp
index 5108715..8a3de2b 100644
--- a/src/Client/PseuWoW.cpp
+++ b/src/Client/PseuWoW.cpp
@@ -493,8 +493,12 @@ void PseuInstanceConf::ApplyFromVarSet(VarSet &v)
     exitonerror=(bool)atoi(v.Get("EXITONERROR").c_str());
     reconnect=atoi(v.Get("RECONNECT").c_str());
     realmport=atoi(v.Get("REALMPORT").c_str());
-    clientversion_string=v.Get("CLIENTVERSION");
-    clientbuild=atoi(v.Get("CLIENTBUILD").c_str());
+    client=atoi(v.Get("CLIENT").c_str());
+    if(client==9) //9 = Custom settings
+    {
+      clientversion_string=v.Get("CLIENTVERSION");
+      clientbuild=atoi(v.Get("CLIENTBUILD").c_str());
+    }
     clientlang=v.Get("CLIENTLANGUAGE");
     realmname=v.Get("REALMNAME");
     charname=v.Get("CHARNAME");
@@ -518,24 +522,49 @@ void PseuInstanceConf::ApplyFromVarSet(VarSet &v)
     dataLoaderThreads=atoi(v.Get("DATALOADERTHREADS").c_str());
     useMPQ=(bool)atoi(v.Get("USEMPQ").c_str());
 
-    // clientversion is a bit more complicated to add
+    switch(client)
     {
-        std::string opt=clientversion_string + ".";
-        std::string num;
-        uint8 p=0;
-        for(uint8 i=0;i<opt.length();i++)
+      case 0:
+      {
+        clientbuild = 6005;
+        clientversion_string="1.12.2";
+        break;
+      }
+      case 1:
+      {
+        clientbuild = 8606;
+        clientversion_string="2.4.3";
+        break;
+      }
+      case 2:
+      {
+        clientbuild = 12340;
+        clientversion_string="3.3.5";
+        break;
+      }
+      case 3:
+      default:
+      {
+        logerror("Unknown client - check conf");
+      }
+    }
+
+    // clientversion is a bit more complicated to add
+    std::string opt=clientversion_string + ".";
+    std::string num;
+    uint8 p=0;
+    for(uint8 i=0;i<opt.length();i++)
+    {
+        if(!isdigit(opt.at(i)))
         {
-            if(!isdigit(opt.at(i)))
-            {
-                clientversion[p]=(unsigned char)atoi(num.c_str());
-                num.clear();
-                p++;
-                if(p>2)
-                    break;
-                continue;
-            }
-            num+=opt.at(i);
+            clientversion[p]=(unsigned char)atoi(num.c_str());
+            num.clear();
+            p++;
+            if(p>2)
+                break;
+            continue;
         }
+        num+=opt.at(i);
     }
 
     // GUI related
diff --git a/src/Client/PseuWoW.h b/src/Client/PseuWoW.h
index 2d87944..b8c38f8 100644
--- a/src/Client/PseuWoW.h
+++ b/src/Client/PseuWoW.h
@@ -47,6 +47,7 @@ class PseuInstanceConf
     uint32 reconnect;
     uint16 realmport;
     uint16 worldport;
+    uint8 client;
     uint8 clientversion[3];
     std::string clientversion_string;
     uint16 clientbuild;