diff --git a/requirements_JUWELS_outcommented.txt b/requirements_JUWELS_outcommented.txt
index 2432b0573fd955d11409baebbdd09bac2f59737b..821dd802579b119c19f2bb2d8f097a4bac71adc0 100644
--- a/requirements_JUWELS_outcommented.txt
+++ b/requirements_JUWELS_outcommented.txt
@@ -22,7 +22,7 @@ importlib-metadata==1.5.0
 # kiwisolver==1.1.0              # in SciPy-Stack
 # locket==0.2.0                  # in Jupyter
 # Markdown==3.2.1                # in TF 
-# matplotlib==3.2.0              # in SciPy-Stack 
+matplotlib==3.2.0              # in SciPy-Stack 
 # mock==4.0.1                    # in Python 
 # more-itertools==8.2.0          # in Python 
 # numpy==1.18.1                  # in SciPy-Stack
diff --git a/src/helpers.py b/src/helpers.py
index a1c508581449999215e3cb131b6e56befe9e9ac1..3ea9d618392c83e8744f32d130b781b113a649fb 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -8,6 +8,7 @@ import datetime as dt
 import logging
 import math
 import os
+import getpass
 import socket
 import sys
 import time
@@ -104,7 +105,8 @@ def get_host():
 def prepare_host(create_new=True, sampling="daily"):
     hostname = socket.gethostname()
     try:
-        user = os.getlogin()
+        # user = os.getlogin()
+        user = getpass.getuser()
     except OSError:
         user = "default"
     if hostname == "ZAM144":
@@ -115,7 +117,7 @@ def prepare_host(create_new=True, sampling="daily"):
         path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
     elif (len(hostname) > 2) and (hostname[:2] == "jr"):
         path = f"/p/project/cjjsc42/{user}/DATA/toar_{sampling}/"
-    elif (len(hostname) > 2) and (hostname[:2] == "jw"):
+    elif (len(hostname) > 2) and (hostname[:2] in ['jw', 'ju']):
         path = f"/p/home/jusers/{user}/juwels/intelliaq/DATA/toar_{sampling}/"
     elif "runner-6HmDp9Qd-project-2411-concurrent" in hostname:
         path = f"/home/{user}/machinelearningtools/data/toar_{sampling}/"
diff --git a/src/run_modules/experiment_setup.py b/src/run_modules/experiment_setup.py
index 71f21c7f62c26b9692b67909a693f9d645b93814..70e75e22c952f258eb401666a3df2ebaa232cf14 100644
--- a/src/run_modules/experiment_setup.py
+++ b/src/run_modules/experiment_setup.py
@@ -24,7 +24,7 @@ DEFAULT_VAR_ALL_DICT = {'o3': 'dma8eu', 'relhum': 'average_values', 'temp': 'max
 DEFAULT_TRANSFORMATION = {"scope": "data", "method": "standardise", "mean": "estimate"}
 DEFAULT_PLOT_LIST = ["PlotMonthlySummary", "PlotStationMap", "PlotClimatologicalSkillScore", "PlotTimeSeries",
                      "PlotCompetitiveSkillScore", "PlotBootstrapSkillScore", "plot_conditional_quantiles"]
-DEFAULT_HPC_HOST_LIST = ["jw", "jr"] #first part of node names for Juwels (jw) and Jureca(jr).
+DEFAULT_HPC_HOST_LIST = ["jw", "ju", "jr"] #first part of node names for Juwels (jw[comp], ju[login]) and Jureca(jr).
 
 
 class ExperimentSetup(RunEnvironment):