diff --git a/core/avhrrsatellite.cpp b/core/avhrrsatellite.cpp
index 2f71589..02a48df 100644
--- a/core/avhrrsatellite.cpp
+++ b/core/avhrrsatellite.cpp
@@ -1,4 +1,5 @@
 #include "avhrrsatellite.h"
+
 #include <QDebug>
 #include <QDate>
 #include <QApplication>
diff --git a/core/datahubaccessmanager.cpp b/core/datahubaccessmanager.cpp
index 7278982..73cb0df 100644
--- a/core/datahubaccessmanager.cpp
+++ b/core/datahubaccessmanager.cpp
@@ -54,9 +54,9 @@ void DatahubAccessManager::DownloadXML(int nbrofpages, eDatahub hub)
     // HTTP Basic authentication header value: base64(username:password)
     QString concatenated;
     if(this->hub == HUBESA)
-        concatenated = opts.esauser + ":" + opts.esapassword;
+        concatenated = opts.datahubuser + ":" + opts.datahubpassword;
     else
-        concatenated = opts.eumetsatuser + ":" + opts.eumetsatpassword;
+        concatenated = opts.datahubuser + ":" + opts.datahubpassword;
 
     QByteArray data = concatenated.toLocal8Bit().toBase64();
     QString headerData = "Basic " + data;
@@ -140,9 +140,9 @@ void DatahubAccessManager::DownloadXML(QDate selectdate, eDatahub hub, QString t
 
     QString concatenated;
     if(this->hub == HUBESA)
-        concatenated = opts.esauser + ":" + opts.esapassword;
+        concatenated = opts.datahubuser + ":" + opts.datahubpassword;
     else
-        concatenated = opts.eumetsatuser + ":" + opts.eumetsatpassword;
+        concatenated = opts.datahubuser + ":" + opts.datahubpassword;
 
     QByteArray data = concatenated.toLocal8Bit().toBase64();
     QString headerData = "Basic " + data;
@@ -205,9 +205,9 @@ void DatahubAccessManager::slotFinishedXML()
         // HTTP Basic authentication header value: base64(username:password)
         QString concatenated;
         if(this->hub == HUBESA)
-            concatenated = opts.esauser + ":" + opts.esapassword;
+            concatenated = opts.datahubuser + ":" + opts.datahubpassword;
         else
-            concatenated = opts.eumetsatuser + ":" + opts.eumetsatpassword;
+            concatenated = opts.datahubuser + ":" + opts.datahubpassword;
         QByteArray data = concatenated.toLocal8Bit().toBase64();
         QString headerData = "Basic " + data;
         request.setRawHeader("Authorization", headerData.toLocal8Bit());
@@ -423,9 +423,9 @@ void DatahubAccessManager::DownloadProduct(QList<ProductList> prodlist, int inde
     // HTTP Basic authentication header value: base64(username:password)
     QString concatenated;
     if(hub == HUBESA)
-        concatenated = opts.esauser + ":" + opts.esapassword;
+        concatenated = opts.datahubuser + ":" + opts.datahubpassword;
     else
-        concatenated = opts.eumetsatuser + ":" + opts.eumetsatpassword;
+        concatenated = opts.datahubuser + ":" + opts.datahubpassword;
     QByteArray data = concatenated.toLocal8Bit().toBase64();
     QString headerData = "Basic " + data;
 
diff --git a/core/dialogpreferences.cpp b/core/dialogpreferences.cpp
index 417a4a2..6afa8cb 100644
--- a/core/dialogpreferences.cpp
+++ b/core/dialogpreferences.cpp
@@ -374,10 +374,10 @@ void DialogPreferences::setupMERSIConfigTable()
 
 void DialogPreferences::setupDatahubConfig()
 {
-    ui->leEsaUser->setText(opts.esauser);
-    ui->leEsaPassword->setText(opts.esapassword);
-    ui->leEumetsatUser->setText(opts.eumetsatuser);
-    ui->leEumetsatPassword->setText(opts.eumetsatpassword);
+    ui->leDatahubUserId->setText(opts.datahubuser);
+//    ui->leEsaPassword->setText(opts.esapassword);
+//    ui->leEumetsatUser->setText(opts.eumetsatuser);
+//    ui->leEumetsatPassword->setText(opts.eumetsatpassword);
     ui->leProductDirectory->setText(opts.productdirectory);
     if(opts.provideresaoreumetsat)
         ui->rdbUseScihub->setChecked(true);
@@ -645,10 +645,6 @@ void DialogPreferences::dialogaccept()
     opts.remove_SLSTR_dirs = ui->rdbRemoveSLSTRDirs->isChecked();
     opts.usesaturationmask = ui->rdbSaturation->isChecked();
 
-    opts.esauser = ui->leEsaUser->text();
-    opts.esapassword = ui->leEsaPassword->text();
-    opts.eumetsatuser = ui->leEumetsatUser->text();
-    opts.eumetsatpassword = ui->leEumetsatPassword->text();
     opts.productdirectory = ui->leProductDirectory->text();
     if(ui->rdbUseScihub->isChecked())
         opts.provideresaoreumetsat = true;
@@ -656,7 +652,7 @@ void DialogPreferences::dialogaccept()
         opts.provideresaoreumetsat = false;
 
     opts.xmllogging = ui->rdbXMLlogging->isChecked();
-
+    opts.datahubuser = ui->leDatahubUserId->text();
 
     if(POItablechanged)
         done(2);
@@ -3252,3 +3248,4 @@ void DialogPreferences::on_btnSearchProductDirectory_clicked()
     }
 
 }
+
diff --git a/core/dialogpreferences.h b/core/dialogpreferences.h
index b13129b..19e1eda 100644
--- a/core/dialogpreferences.h
+++ b/core/dialogpreferences.h
@@ -4,6 +4,9 @@
 #include <QDialog>
 #include <QListWidgetItem>
 #include <QColorDialog>
+#include <QLabel>
+#include <QGroupBox>
+#include <QDialogButtonBox>
 
 #include "options.h"
 
diff --git a/core/dialogpreferences.ui b/core/dialogpreferences.ui
index 3290d47..ed59dc8 100644
--- a/core/dialogpreferences.ui
+++ b/core/dialogpreferences.ui
@@ -2034,7 +2034,7 @@
         </layout>
        </widget>
        <widget class="QWidget" name="pageScihubCodaConfig">
-        <layout class="QVBoxLayout" name="verticalLayout_21">
+        <layout class="QVBoxLayout" name="verticalLayout_19">
          <item>
           <widget class="QLabel" name="label_21">
            <property name="font">
@@ -2050,84 +2050,6 @@
            </property>
           </widget>
          </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_29">
-           <item>
-            <widget class="QGroupBox" name="groupBox_4">
-             <property name="title">
-              <string>Copernicus Open Access Hub (E.S.A)</string>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_19">
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_21">
-                <item>
-                 <widget class="QLabel" name="label_15">
-                  <property name="text">
-                   <string>User : </string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="leEsaUser"/>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_22">
-                <item>
-                 <widget class="QLabel" name="label_16">
-                  <property name="text">
-                   <string>Password :</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="leEsaPassword"/>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-           <item>
-            <widget class="QGroupBox" name="groupBox_5">
-             <property name="title">
-              <string>Copernicus Data Access (Eumetsat)</string>
-             </property>
-             <layout class="QVBoxLayout" name="verticalLayout_20">
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_24">
-                <item>
-                 <widget class="QLabel" name="label_18">
-                  <property name="text">
-                   <string>User : </string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="leEumetsatUser"/>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_23">
-                <item>
-                 <widget class="QLabel" name="label_17">
-                  <property name="text">
-                   <string>Password :</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="leEumetsatPassword"/>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </item>
          <item>
           <widget class="QGroupBox" name="groupBox_6">
            <property name="title">
@@ -2151,6 +2073,20 @@
            </layout>
           </widget>
          </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_21">
+           <item>
+            <widget class="QLabel" name="label_15">
+             <property name="text">
+              <string>Datahub User Id : </string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="leDatahubUserId"/>
+           </item>
+          </layout>
+         </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_25">
            <item>
@@ -2248,40 +2184,6 @@
            </item>
           </layout>
          </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_31">
-           <item>
-            <spacer name="horizontalSpacer_18">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_27">
-           <item>
-            <spacer name="horizontalSpacer_20">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
          <item>
           <spacer name="verticalSpacer_4">
            <property name="orientation">
diff --git a/core/formmapcyl.cpp b/core/formmapcyl.cpp
index 8621d3d..56d257f 100644
--- a/core/formmapcyl.cpp
+++ b/core/formmapcyl.cpp
@@ -2,6 +2,8 @@
 
 #include "formmapcyl.h"
 #include "ui_formmapcyl.h"
+#include "dialogpreferences.h"
+
 #include <netcdf.h>
 
 extern Options opts;
@@ -2271,8 +2273,9 @@ void FormMapCyl::on_btnCancelDownloadProduct_clicked()
 }
 
 
-void FormMapCyl::on_btnDownloadFromDatahub_clicked()
+void FormMapCyl::on_btnDownloadXMLFromDatahub_clicked()
 {
+    bool ok = false;
     QFile segfile("Segments.xml");
     segfile.remove();
 
@@ -2284,7 +2287,31 @@ void FormMapCyl::on_btnDownloadFromDatahub_clicked()
     else if(ui->rdbDownloadXMLSLSTR->isChecked())
         type = "SLSTR";
 
-    segs->LoadXMLfromDatahub(ui->calendarDatahub->selectedDate(), type);
+    if(opts.datahubuser.isEmpty())
+    {
+        QMessageBox::StandardButton reply;
+        reply = QMessageBox::critical(this, tr("Datahub User Id"),
+                                        "The Datahub User Id is empty. Open the 'Preferences' , 'Scihub/CODA config' and fill in the User Id",
+                                        QMessageBox::Ok);
+        if (reply == QMessageBox::Ok)
+            return;
+    }
+    if(opts.datahubpassword.isEmpty())
+    {
+
+        QString text = QInputDialog::getText(this, tr("Your Datahub password "),
+                                             tr("Password : "), QLineEdit::Normal, "",&ok);
+        if (ok && !text.isEmpty())
+            opts.datahubpassword = text;
+        else
+            return;
+
+    }
+    else
+        ok = false;
+
+    if(ok)
+        segs->LoadXMLfromDatahub(ui->calendarDatahub->selectedDate(), type);
 }
 
 
diff --git a/core/formmapcyl.h b/core/formmapcyl.h
index a206664..b4f6316 100644
--- a/core/formmapcyl.h
+++ b/core/formmapcyl.h
@@ -123,7 +123,7 @@ private slots:
 
     void on_btnCancelDownloadProduct_clicked();
 
-    void on_btnDownloadFromDatahub_clicked();
+    void on_btnDownloadXMLFromDatahub_clicked();
 
     void on_btnMERSI_clicked();
 
diff --git a/core/formmapcyl.ui b/core/formmapcyl.ui
index 28e1689..5959ba5 100644
--- a/core/formmapcyl.ui
+++ b/core/formmapcyl.ui
@@ -667,7 +667,7 @@
           </layout>
          </item>
          <item>
-          <widget class="QPushButton" name="btnDownloadFromDatahub">
+          <widget class="QPushButton" name="btnDownloadXMLFromDatahub">
            <property name="minimumSize">
             <size>
              <width>0</width>
diff --git a/core/options.cpp b/core/options.cpp
index b47a147..a2628a5 100644
--- a/core/options.cpp
+++ b/core/options.cpp
@@ -246,10 +246,10 @@ void Options::Initialize(bool recreate_geo_ini)
     texture_changed = false;
     gridonolciimage = false;
 
-    esauser = settings.value("/datahub/esauser", "").value<QString>();
-    esapassword = settings.value("/datahub/esapassword", "").value<QString>();
-    eumetsatuser = settings.value("/datahub/eumetsatuser", "").value<QString>();
-    eumetsatpassword = settings.value("/datahub/eumetsatpassword", "").value<QString>();
+    datahubuser = settings.value("/datahub/datahubuser", "").value<QString>();
+//    esapassword = settings.value("/datahub/esapassword", "").value<QString>();
+//    eumetsatuser = settings.value("/datahub/eumetsatuser", "").value<QString>();
+//    eumetsatpassword = settings.value("/datahub/eumetsatpassword", "").value<QString>();
     productdirectory = settings.value("/datahub/productdirectory", "").value<QString>();
     provideresaoreumetsat = settings.value("/datahub/provideresaoreumetsat", false).toBool();
     downloadxmlolciefr = settings.value("/datahub/downloadxmlolciefr", false).toBool();
@@ -539,10 +539,10 @@ void Options::Save()
     settings.setValue("/parameters/removeslstrdirs", remove_SLSTR_dirs);
     settings.setValue("/parameters/usesaturationmask", usesaturationmask);
 
-    settings.setValue("/datahub/esauser", esauser);
-    settings.setValue("/datahub/esapassword", esapassword);
-    settings.setValue("/datahub/eumetsatuser", eumetsatuser);
-    settings.setValue("/datahub/eumetsatpassword", eumetsatpassword);
+    settings.setValue("/datahub/datahubuser", datahubuser);
+//    settings.setValue("/datahub/esapassword", esapassword);
+//    settings.setValue("/datahub/eumetsatuser", eumetsatuser);
+//    settings.setValue("/datahub/eumetsatpassword", eumetsatpassword);
     settings.setValue("/datahub/productdirectory", productdirectory);
     settings.setValue("/datahub/provideresaoreumetsat", provideresaoreumetsat);
 
diff --git a/core/options.h b/core/options.h
index 9018182..153cf7f 100644
--- a/core/options.h
+++ b/core/options.h
@@ -277,10 +277,8 @@ class Options
     bool texture_changed;
     bool gridonolciimage;
 
-    QString esauser;
-    QString esapassword;
-    QString eumetsatuser;
-    QString eumetsatpassword;
+    QString datahubuser;
+    QString datahubpassword;
     QString productdirectory;
     bool provideresaoreumetsat; // 0 = ESA , 1 = eumetsat
     bool downloadxmlolciefr;