diff --git a/ChangeLog b/ChangeLog
index 3a85daa9..e59cd720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,12 +19,11 @@
 
 - scale channel instrument picture in Compact skin mode
 
-- redesign of the server dialog
+- redesign of the server dialog (e.g. added welcome message setting)
 
 - bug fix: grouping faders in the client should be proportional (see discussion in #202, #419)
 
 
-TODO store welcome message set in the GUI in the ini file
 
 TODO improve settings management -> move settings class in client/server classes, move actual settings variables
 TODO improve interaction between use of inifile and command line parameters (edited) #120
diff --git a/src/settings.cpp b/src/settings.cpp
index 0253688e..c7ccd2a5 100755
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -825,6 +825,12 @@ if ( GetFlagIniSet ( IniXMLDocument, "server", "defcentservaddr", bValue ) )
         pServer->SetLicenceType ( static_cast<ELicenceType> ( iValue ) );
     }
 
+    // welcome message (command line overwrites setting file)
+    if ( pServer->GetWelcomeMessage().isEmpty() )
+    {
+        pServer->SetWelcomeMessage ( FromBase64ToString ( GetIniSetting ( IniXMLDocument, "server", "welcome" ) ) );
+    }
+
     // window position of the main window
     vecWindowPosMain = FromBase64ToByteArray (
         GetIniSetting ( IniXMLDocument, "server", "winposmain_base64" ) );
@@ -868,6 +874,10 @@ void CServerSettings::WriteToXML ( QDomDocument& IniXMLDocument )
     SetNumericIniSet ( IniXMLDocument, "server", "licencetype",
         static_cast<int> ( pServer->GetLicenceType() ) );
 
+    // welcome message
+    PutIniSetting ( IniXMLDocument, "server", "welcome",
+        ToBase64 ( pServer->GetWelcomeMessage() ) );
+
     // window position of the main window
     PutIniSetting ( IniXMLDocument, "server", "winposmain_base64",
         ToBase64 ( vecWindowPosMain ) );