diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalProcessMiner.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalProcessMiner.java
index d97c3d3c989..a810590f84f 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalProcessMiner.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalProcessMiner.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@
  * David McKnight     (IBM)   [224906] [dstore] changes for getting properties and doing exit due to single-process capability
  * David McKnight  (IBM)  - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
  * David McKnight  (IBM)  - [364633] [dstore][multithread] process miner getting wrong uid
+ * David McKnight  (IBM)  - [385214] [dstore][processes] user id query coming back blank
  *******************************************************************************/
 
 package org.eclipse.rse.dstore.universal.miners;
@@ -151,14 +152,14 @@ public class UniversalProcessMiner extends Miner
 	 * Get the username
 	 */
 	protected DataElement handleQueryUserName(DataElement subject, DataElement status) {
+		String userName = null;
 		if (_dataStore.getClient() != null){
-			String userName = _dataStore.getClient().getProperty("client.username"); //$NON-NLS-1$
-			subject.setAttribute(DE.A_VALUE, userName); 		
+			userName = _dataStore.getClient().getProperty("client.username"); //$NON-NLS-1$		
 		}
-		else {
-			String userName = System.getProperty("user.name"); //$NON-NLS-1$
-			subject.setAttribute(DE.A_VALUE, userName); 
+		if (userName == null){
+			userName = System.getProperty("user.name"); //$NON-NLS-1$			
 		}
+		subject.setAttribute(DE.A_VALUE, userName); 
 		
 		_dataStore.refresh(subject);