diff --git a/UI_V2/pages/profile/profilepage.py b/UI_V2/pages/profile/profilepage.py
index 984914d..856b9f1 100644
--- a/UI_V2/pages/profile/profilepage.py
+++ b/UI_V2/pages/profile/profilepage.py
@@ -11,22 +11,24 @@ class ProfilePage:
         self.company = self.company_manager.get_company(self.user['id'])
         prenume = ''
         if "@default.com" not in self.user['email']:
-            if '~' in self.user['name']:
-                prenume = self.user['name'].split('~')[0] 
+            if self.user['name']:
+                if '~' in self.user['name']:
+                    prenume = self.user['name'].split('~')[0] 
         self.first_name = ft.TextField(
             label="Prenume",
             value=prenume
         )
         nume = ''
         if "@default.com" not in self.user['email']:
-            if '~' in self.user['name']:
-                nume = self.user['name'].split('~')[1] 
+            if self.user['name']:
+                if '~' in self.user['name']:
+                    nume = self.user['name'].split('~')[1] 
         self.last_name = ft.TextField(
             label="Nume",
             value=nume
         )
         self.email = ft.TextField(label="E-mail", value=self.user['email'], read_only=True)
-        self.phone = ft.TextField(label="Telefon", value=self.user['phone'])
+        self.phone = ft.TextField(label="Telefon", value=self.user['phone'] if self.user['phone'] else None)
         address = ''
         if self.user['address']:
             if "~" in self.user['address']: