diff --git a/portal/models.py b/portal/models.py
index 1d3d916d6de2e32204d927a729d37cce99f7f166..d1ab9f45b96c128d8526c034962b7539e095ee58 100755
--- a/portal/models.py
+++ b/portal/models.py
@@ -173,7 +173,7 @@ class DataFile(models.Model):
     objects = DataFileManager()
 
     def __str__(self):
-        return self.filename
+        return f"{self.filename} ({self.iric_data_id})"
 
     @property
     def filext(self):
diff --git a/portal/templates/portal/secure/base.html b/portal/templates/portal/secure/base.html
index 1276840b62b4788af96585b9388177cef5bdf1f4..16efef5bcf11f72b52e09080133667bfac923f1d 100644
--- a/portal/templates/portal/secure/base.html
+++ b/portal/templates/portal/secure/base.html
@@ -9,7 +9,7 @@
 
 {% block welcome %}
     {% if user.is_authenticated %}
-        <div class="navbar-text mr-3 d-none d-md-inline-flex">{% trans 'Welcome back,' %} {{ user.first_name }}</div>
+        <div class="navbar-text mr-3 d-none d-md-inline-flex">{% trans 'Welcome back,' %} {{ user.profile.fullname }}</div>
     {% endif %}
 {% endblock %}