diff --git a/UI_V2/pages/profile/profilepage.py b/UI_V2/pages/profile/profilepage.py
index 709ecc6..af2b79d 100644
--- a/UI_V2/pages/profile/profilepage.py
+++ b/UI_V2/pages/profile/profilepage.py
@@ -11,11 +11,11 @@ class ProfilePage:
         self.company = self.company_manager.get_company(self.user['id'])
         self.first_name = ft.TextField(
             label="Prenume",
-            value=self.user['name'].split('~')[0] if "@default.com" not in self.user['email'] else None
+            value=self.user['name'].split('~')[0] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
         )
         self.last_name = ft.TextField(
             label="Nume",
-            value=self.user['name'].split('~')[1] if "@default.com" not in self.user['email'] else None
+            value=self.user['name'].split('~')[1] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
         )
         self.email = ft.TextField(label="E-mail", value=self.user['email'], read_only=True)
         self.phone = ft.TextField(label="Telefon", value=self.user['phone'])
@@ -24,11 +24,11 @@ class ProfilePage:
             multiline=True, 
             min_lines=3, 
             max_lines=5, 
-            value = self.user['address'].split("~")[0].split("%")[1] if self.user['address'] else ''
+            value = self.user['address'].split("~")[0].split("%")[1] if self.user['address'] and "~" in self.user['address']  else ''
         )
         self.city = ft.TextField(
             label="Oras",
-            value = self.user['address'].split("~")[0].split('%')[0] if self.user['address'] else ''
+            value = self.user['address'].split("~")[0].split('%')[0] if self.user['address'] and "~" in self.user['address'] else ''
         )
         self.company_name = ft.TextField(
             label="Denumire firma", 
@@ -54,7 +54,7 @@ class ProfilePage:
                 multiline=True, 
                 min_lines=3, 
                 max_lines=5,
-                value=self.user['address'].split("~")[1] if self.user['address'] and len(self.user['address'].split("~"))>1 else ''
+                value=self.user['address'].split("~")[1] if self.user['address'] and "~" in self.user['address'] and len(self.user['address'].split("~"))>1 else ''
             )
         self.second_address_placeholder =ft.Column()
         self.order_placeholder =ft.Column()
diff --git a/UI_V2/pages/shopping_cart/cart.py b/UI_V2/pages/shopping_cart/cart.py
index 1184a37..c4d4dbe 100644
--- a/UI_V2/pages/shopping_cart/cart.py
+++ b/UI_V2/pages/shopping_cart/cart.py
@@ -88,11 +88,11 @@ class Cart:
         self.company = self.company_manager.get_company(self.user['id'])
         self.first_name = ft.TextField(
             label="Prenume",
-            value=self.user['name'].split('~')[0] if "@default.com" not in self.user['email'] else None
+            value=self.user['name'].split('~')[0] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
         )
         self.last_name = ft.TextField(
             label="Nume",
-            value=self.user['name'].split('~')[1] if "@default.com" not in self.user['email'] else None
+            value=self.user['name'].split('~')[1] if "@default.com" not in self.user['email'] and '~' in self.user['email'] else None
         )
 
         self.email = ft.TextField(
@@ -109,11 +109,11 @@ class Cart:
             multiline=True, 
             min_lines=3, 
             max_lines=5, 
-            value = self.user['address'].split("~")[0].split("%")[1] if self.user['address'] else ''
+            value = self.user['address'].split("~")[0].split("%")[1] if self.user['address'] and "~" in self.user['address']  else ''
         )
         self.city = ft.TextField(
             label="Oras",
-            value = self.user['address'].split("~")[0].split('%')[0] if self.user['address'] else ''
+            value = self.user['address'].split("~")[0].split('%')[0] if self.user['address'] and "~" in self.user['address'] else ''
         )
 
         self.company_name = ft.TextField(
@@ -140,7 +140,7 @@ class Cart:
                 multiline=True, 
                 min_lines=3, 
                 max_lines=5,
-                value=self.user['address'].split("~")[1] if self.user['address'] and len(self.user['address'].split("~"))>1 else ''
+                value=self.user['address'].split("~")[1] if self.user['address'] and "~" in self.user['address'] and len(self.user['address'].split("~"))>1 else ''
             )
         self.second_address_placeholder =ft.Column()
         self.order_placeholder =ft.Column()