diff --git a/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py b/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py
index 126b4b91f5bc7329482afe5b8e2effa8c36c0160..8cdf5347ace433008d68417dd36714f3dcb720ed 100644
--- a/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py
+++ b/services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py
@@ -58,7 +58,7 @@ class Command(BaseCommand):
                                      supports_user_auth     = False,
                                      supports_pass_auth     = True)
 
-            # BasicMetaDesktop Singularity (sarusso repo)
+            # BasicMetaDesktop Docker (sarusso repo)
             Container.objects.create(user     = None,
                                      name     = 'BasicMetaDesktop latest',
                                      image    = 'sarusso/basicmetadesktop',
@@ -70,11 +70,11 @@ class Command(BaseCommand):
                                      supports_pass_auth     = True)
 
 
-            # DevMetaDesktop Singularity (sarusso repo)
+            # DevMetaDesktop Docker (sarusso repo)
             Container.objects.create(user     = None,
                                      name     = 'DevMetaDesktop latest',
                                      image    = 'sarusso/devmetadesktop',
-                                     type     = 'singularity',
+                                     type     = 'docker',
                                      registry = 'docker_hub',
                                      ports    = '8590',
                                      supports_dynamic_ports = True,
@@ -150,7 +150,7 @@ class Command(BaseCommand):
         else:
             print('Creating testuser private containers...')
 
-            # JuPyter Singularity
+            # Jupyter Singularity
             Container.objects.create(user     = testuser,
                                      name     = 'Jupyter Notebook latest',
                                      image    = 'jupyter/base-notebook',
@@ -161,7 +161,7 @@ class Command(BaseCommand):
                                      supports_user_auth     = False,
                                      supports_pass_auth     = False)
             
-            # JuPyter Docker
+            # Jupyter Docker
             Container.objects.create(user     = testuser,
                                      name     = 'Jupyter Notebook latest',
                                      image    = 'jupyter/base-notebook',
diff --git a/services/webapp/code/rosetta/core_app/models.py b/services/webapp/code/rosetta/core_app/models.py
index ab0911ac0044a83ae6bf437c39de47f68bba86bd..6d4da2e4c717645fd92240bf4b3afb35524ee68e 100644
--- a/services/webapp/code/rosetta/core_app/models.py
+++ b/services/webapp/code/rosetta/core_app/models.py
@@ -74,7 +74,7 @@ class LoginToken(models.Model):
 class Container(models.Model):
 
     uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
-    user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE, null=True)  
+    user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE, blank=True, null=True)  
     # If a container has no user, it will be available to anyone. Can be created, edited and deleted only by admins.
 
     name     = models.CharField('Container Name', max_length=255, blank=False, null=False)