diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java
index d5d729b4055..fb3a2fcf823 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalServerUtilities.java
@@ -13,6 +13,7 @@
  * Contributors:
  * Noriaki Takatsu (IBM) - [220126] [dstore][api][breaking] Single process server for multiple clients
  * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
+ * Noriaki Takatsu (IBM) - [239068] [multithread] "client.username" property must be set via dataStore Client
  ********************************************************************************/
 
 package org.eclipse.rse.dstore.universal.miners;
@@ -42,33 +43,7 @@ public class UniversalServerUtilities {
 	 */
 	 public static String getUserPreferencesDirectory(DataStore dataStore)
 	 {
-	  String userPreferencesDirectory = dataStore.getClient().getProperty("user.home"); //$NON-NLS-1$
-
-	   String clientUserID = System.getProperty("client.username"); //$NON-NLS-1$
-	   if (clientUserID == null || clientUserID.equals("")) //$NON-NLS-1$
-	   {
-	    clientUserID = ""; //$NON-NLS-1$
-	   }
-	   else
-	   {
-	    clientUserID += File.separator;
-	   }
-
-	    // append a '/' if not there
-	     if ( userPreferencesDirectory.length() == 0 ||
-	          userPreferencesDirectory.charAt( userPreferencesDirectory.length() -1 ) != File.separatorChar ) {
-
-	    userPreferencesDirectory = userPreferencesDirectory + File.separator;
-	      }
-
-	     userPreferencesDirectory = userPreferencesDirectory + ".eclipse" + File.separator +  //$NON-NLS-1$
-	                          "RSE" + File.separator + clientUserID; //$NON-NLS-1$
-	     File dirFile = new File(userPreferencesDirectory);
-	     if (!dirFile.exists()) {
-	      dirFile.mkdirs();
-	     }
-
-	   return userPreferencesDirectory;
+	   return dataStore.getUserPreferencesDirectory();
 	 }