diff --git a/misc/user-info/user-info.bpmn b/misc/user-info/user-info.bpmn
index 42da12c1..28442da9 100644
--- a/misc/user-info/user-info.bpmn
+++ b/misc/user-info/user-info.bpmn
@@ -34,7 +34,6 @@ current_user_extras = {}
 
 # Add 
 current_user_extras["bamboo_api_id"] = userBambooId
-current_user_extras["full_name"] = userFullName
 
 current_user_extras["time_zone"] = userTimeZone
 current_user_extras["date_format"] = userDateFormat
@@ -44,6 +43,10 @@ current_user_extras["time_format"] = userTimeFormat
 current_user_extras["first_name"] = resp_BambooUserInfo["firstName"]
 current_user_extras["last_name"] = resp_BambooUserInfo["lastName"]
 current_user_extras["preferred_name"] = resp_BambooUserInfo["preferredName"]
+if current_user_extras["preferred_name"] is None:
+    current_user_extras["full_name"] = current_user_extras["first_name"] + " " + current_user_extras["last_name"]
+else:
+    current_user_extras["full_name"] = current_user_extras["first_name"] + " " + current_user_extras["last_name"]
 current_user_extras["status_key"] = resp_BambooUserInfo["customStatusChatKey"]
 current_user_extras["bamboo_supervisor_api_id"] = resp_BambooUserInfo["supervisorEid"]
 current_user_extras["bamboo_supervisor_status_id"] = resp_BambooUserInfo["supervisorId"]