diff --git a/server/autho.gif b/server/autho.gif
index 4ab174810..4c02d18a0 100755
Binary files a/server/autho.gif and b/server/autho.gif differ
diff --git a/server/dongle.cpp b/server/dongle.cpp
index 3f417ca25..42b2e37b2 100755
--- a/server/dongle.cpp
+++ b/server/dongle.cpp
@@ -354,10 +354,8 @@ inline void reset_bit(unsigned short& w, unsigned char b)
 
 extern "C"
 {
-__declspec(dllimport) int Login(const char* session, const char* product);
-__declspec(dllimport) int ApriModulo(const char* session, const char* product);
-__declspec(dllimport) int ChiudiModulo(const char* session, const char* product);
-__declspec(dllimport) int Logout(const char* session, const char* product);
+#include "..\ssa\h\ssadll.h"
+#include "..\ssa\h\ssaerr.h"
 }
 
 ///////////////////////////////////////////////////////////
@@ -680,8 +678,8 @@ wxString TDongle::GetSessionId() const
 bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles))
 {
   const wxString u = GetSessionId();
-  const bool ok1 = ::Login(u, "Campo") == 0;
-  const bool ok2 = ::Login(u, "Enterprise") != 0; // Test for dll tampering
+  const bool ok1 = SSA_Login(u, "Campo") == 0;
+  const bool ok2 = SSA_Login(u, "Enterprise") != 0; // Test for dll tampering
   const bool ok = ok1 && ok2;
 
   if (ok)
@@ -696,10 +694,10 @@ bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles))
     for (size_t m = 0; m < _code.GetCount(); m++)
     {
       const wxString c = ModuleNumberToCode(m);
-      if (::ApriModulo(u, c) == 0)
+      if (SSA_ApriModulo(u, c) == 0)
       {
         _module.set(m);
-        ::ChiudiModulo(u, c);
+        SSA_ChiudiModulo(u, c);
         unsigned short& mu = _user[m];
         mu = ComputeMaxUsers(m);
         if (mu > _max_users && mu < 128)
@@ -713,7 +711,7 @@ bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles))
 
 bool TDongle::ssa_logout()
 {
-  return ::Logout(GetSessionId(), "Campo") == 0;
+  return SSA_Logout(GetSessionId(), "Campo") == 0;
 }
 
 
@@ -1065,13 +1063,13 @@ unsigned short TDongle::ComputeMaxUsers(size_t module) const
     for (n = 0; n < 32; n++)
     {
       u.Printf("DummyDongle:%d", n);
-      if (::Login(u, "Campo") != 0 || ::ApriModulo(u, m) != 0)
+      if (SSA_Login(u, "Campo") != 0 || SSA_ApriModulo(u, m) != 0)
         break;
     }
     for (short i = 0; i < n; i++)
     {
       u.Printf("DummyDongle:%d", i);
-      ::Logout(u, "Campo");
+      SSA_Logout(u, "Campo");
     }
   }
   return n < 32 ? n : -1;
@@ -1095,7 +1093,7 @@ bool TDongle::OpenModule(size_t module)
   {
     const wxString u = GetSessionId();
     const wxString m = ModuleNumberToCode(module);
-    if (::ApriModulo(u, m) != 0)
+    if (SSA_ApriModulo(u, m) != 0)
       return false;
   }
 
diff --git a/server/server.rc b/server/server.rc
index da37be4e2..a6017dde4 100755
--- a/server/server.rc
+++ b/server/server.rc
@@ -1,4 +1,4 @@
-soap ICON "soap.ico"
+soap ICON "../res/CampoSrv.ico"
 #include "wx/msw/wx.rc"
 
 
diff --git a/server/servers.ini b/server/servers.ini
index 275c48fe1..e7bafc442 100755
--- a/server/servers.ini
+++ b/server/servers.ini
@@ -7,20 +7,6 @@ Run=authoriz.exe
 Port=1883
 Donglehw=2
 
-[Coffee]
-Run=coffee.exe
-Icon=coffee.gif
-Port=3887
-
-[DataBase]
-Port=3885
-Icon=DataBase.gif
-Run=DataBase.exe
-LogFile=
-LogVerbose=
-Dsn=
-Query=
-
 [Dictionary]
 Icon=diction.gif
 Run=diction.exe
@@ -29,13 +15,6 @@ Dictionary=english.xml
 LogFile=
 LogVerbose=
 
-[Postman]
-Icon=postman.gif
-Run=postman.exe
-Port=8080
-LogFile=
-LogVerbose=
-
 [Lurch]
 Run=lurch.exe
 Port=10000