diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java
index 686366e63362b5dfcf4c2ef30ab65d6cc1d9dea2..06dc2fcd9e24e2650211e7ae56b43e5e2af63aa4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java
@@ -298,7 +298,14 @@ public class SampleUploadSectionsParser
             List<String> codes = sampleCodeGenerator.generateCodes(newSamples.size());
             for (int i = 0; i < newSamples.size(); i++)
             {
-                newSamples.get(i).setIdentifier(defaultGroupIdentifier + "/" + codes.get(i));
+                if (newSamples.get(i).getDefaultSpaceIdentifier() == null || newSamples.get(i).getDefaultSpaceIdentifier().isEmpty())
+                {
+                    newSamples.get(i).setIdentifier(defaultGroupIdentifier + "/" + codes.get(i));
+                } else
+                {
+                    newSamples.get(i).setIdentifier(
+                            newSamples.get(i).getDefaultSpaceIdentifier() + "/" + codes.get(i));
+                }
             }
         }
     }