diff --git a/img/icons/user-default-icon.png b/img/icons/user-default-icon.png
new file mode 100644
index 0000000..f031151
Binary files /dev/null and b/img/icons/user-default-icon.png differ
diff --git a/js/login.js b/js/login.js
index 68d6b04..34e16e9 100644
--- a/js/login.js
+++ b/js/login.js
@@ -1,4 +1,9 @@
-const setUserGreeting = (username, firstName, userProfilePicture) => {
+const defaultUserProfilePicture = '../img/icons/user-default-icon.png';
+const setUserGreeting = (
+  username,
+  firstName,
+  userProfilePicture = defaultUserProfilePicture,
+) => {
   if (username) {
     const userLoginEl = document.querySelectorAll('.btn-login');
 
@@ -6,7 +11,9 @@ const setUserGreeting = (username, firstName, userProfilePicture) => {
     const msgGreetMsgEl = document.querySelectorAll('.user-greet-msg');
     const userImgEl = document.querySelectorAll('.user-profile-pic');
 
-    const greetMsg = `Hello, ${firstName}!`;
+    const capitalisedName = firstName[0].toUpperCase() + firstName.slice(1);
+    const greetMsg = `Hello, ${capitalisedName}!`;
+    console.log(greetMsg);
     msgGreetMsgEl.forEach((element) => {
       element.innerText = greetMsg;
     });
@@ -52,7 +59,7 @@ const fetchData = () => {
       if (res.incompleteUserDetails) {
         return window.location.replace('https://my.realdevsquad.com/signup');
       }
-      setUserGreeting(username, first_name, picture.url);
+      setUserGreeting(username, first_name, picture?.url);
     })
     .catch((error) => {
       hideSkeleton();
diff --git a/package-lock.json b/package-lock.json
index 2de0e87..c471968 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6420,7 +6420,8 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "jest-regex-util": {
       "version": "29.2.0",
@@ -7567,7 +7568,8 @@
       "version": "8.12.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
       "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "4.0.0",