diff --git a/livesupport/products/scheduler/src/SchedulerDaemon.cxx b/livesupport/products/scheduler/src/SchedulerDaemon.cxx
index f6848d12f..731686285 100644
--- a/livesupport/products/scheduler/src/SchedulerDaemon.cxx
+++ b/livesupport/products/scheduler/src/SchedulerDaemon.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.22 $
+    Version  : $Revision: 1.23 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/SchedulerDaemon.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -178,8 +178,6 @@ SchedulerDaemon :: configure(const xmlpp::Element    & element)
     const xmlpp::Attribute    * attribute;
 
     // read in the user data
-    std::string                 login;
-    std::string                 password;
 
     nodes = element.get_children(userConfigElementName);
     if (nodes.size() < 1) {
@@ -263,15 +261,8 @@ SchedulerDaemon :: configure(const xmlpp::Element    & element)
 
     // do some initialization, using the configured objects
     authentication = acf->getAuthenticationClient();
-    try {
-        sessionId      = authentication->login(login, password);
-    } catch (XmlRpcException &e) {
-        // TODO: mark error
-        std::cerr << "authentication problem: " << e.what() << std::endl;
-    }
-
-    audioPlayer = apf->getAudioPlayer();
-    playLog     = plf->getPlayLog();
+    audioPlayer    = apf->getAudioPlayer();
+    playLog        = plf->getPlayLog();
 
     Ptr<PlaylistEventContainer>::Ref    eventContainer;
     Ptr<time_duration>::Ref             granularity;
@@ -377,6 +368,13 @@ SchedulerDaemon :: uninstall(void)              throw (std::exception)
 void
 SchedulerDaemon :: startup (void)                           throw ()
 {
+    try {
+        sessionId      = authentication->login(login, password);
+    } catch (XmlRpcException &e) {
+        // TODO: mark error
+        std::cerr << "authentication problem: " << e.what() << std::endl;
+    }
+
     audioPlayer->initialize();
     eventScheduler->start();
     XmlRpcDaemon::startup();
diff --git a/livesupport/products/scheduler/src/SchedulerDaemon.h b/livesupport/products/scheduler/src/SchedulerDaemon.h
index 4084b6c9e..8590164dd 100644
--- a/livesupport/products/scheduler/src/SchedulerDaemon.h
+++ b/livesupport/products/scheduler/src/SchedulerDaemon.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.17 $
+    Version  : $Revision: 1.18 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/SchedulerDaemon.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -162,7 +162,7 @@ using namespace LiveSupport::PlaylistExecutor;
  *  </code></pre>
  *
  *  @author  $Author: maroy $
- *  @version $Revision: 1.17 $
+ *  @version $Revision: 1.18 $
  *  @see ConnectionManagerFactory
  *  @see AuthenticationClientFactory
  *  @see StorageClientFactory
@@ -322,6 +322,16 @@ class SchedulerDaemon : public Installable,
          */
         Ptr<ResetStorageMethod>::Ref    resetStorageMethod;
 
+        /**
+         *  The login to the authentication system.
+         */
+        std::string                     login;
+
+        /**
+         *  The password to the authentication system.
+         */
+        std::string                     password;
+
         /**
          *  Default constructor.
          */