2 files changed, 5 insertions, 20 deletions
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index d45d46be3..47a0f0335 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -143,7 +143,7 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent,
         case ServerType::EATHENA:
 #ifdef EATHENA_SUPPORT
 #ifdef TMWA_SUPPORT
-            mTypeField->setSelected(2);
+            mTypeField->setSelected(1);
 #else   // TMWA_SUPPORT
             mTypeField->setSelected(0);
 #endif  // TMWA_SUPPORT
@@ -156,17 +156,10 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent,
         case ServerType::TMWATHENA:
             mTypeField->setSelected(0);
             break;
-        case ServerType::EVOL:
-#ifdef TMWA_SUPPORT
-            mTypeField->setSelected(1);
-#else   // TMWA_SUPPORT
-            mTypeField->setSelected(0);
-#endif  // TMWA_SUPPORT
-            break;
         case ServerType::EVOL2:
 #ifdef EATHENA_SUPPORT
 #ifdef TMWA_SUPPORT
-            mTypeField->setSelected(3);
+            mTypeField->setSelected(2);
 #else   // TMWA_SUPPORT
             mTypeField->setSelected(1);
 #endif  // TMWA_SUPPORT
@@ -243,14 +236,11 @@ void EditServerDialog::action(const ActionEvent &event)
                     case 0:
                         mServer.type = ServerType::TMWATHENA;
                         break;
-                    case 1:
-                        mServer.type = ServerType::EVOL;
-                        break;
 #ifdef EATHENA_SUPPORT
-                    case 2:
+                    case 1:
                         mServer.type = ServerType::EATHENA;
                         break;
-                    case 3:
+                    case 2:
                         mServer.type = ServerType::EVOL2;
                         break;
 #endif
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 158d5909e..179173d2c 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -53,14 +53,10 @@ static std::string serverTypeToString(const ServerTypeT type)
 {
     switch (type)
     {
-#ifdef TMWA_SUPPORT
         case ServerType::TMWATHENA:
+#ifdef TMWA_SUPPORT
             return "TmwAthena";
-        case ServerType::EVOL:
-            return "Evol";
 #else
-        case ServerType::TMWATHENA:
-        case ServerType::EVOL:
             return "";
 #endif
 #ifdef EATHENA_SUPPORT
@@ -92,7 +88,6 @@ static uint16_t defaultPortForServerType(const ServerTypeT type)
         case ServerType::UNKNOWN:
 #ifdef TMWA_SUPPORT
         case ServerType::TMWATHENA:
-        case ServerType::EVOL:
 #endif
             return 6901;
     }