diff --git a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
index d6bee29..6426dcc 100644
--- a/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
+++ b/DigitalData.UserManager.Domain/Entities/BaseEntity.cs
@@ -20,8 +20,7 @@ namespace DigitalData.UserManager.Domain.Entities
 #if NET7_0_OR_GREATER
             ?
 #endif
-            AddedWho
-        { get; set; }
+            AddedWho { get; set; }
 
         [StringLength(50)]
         [Column("CHANGED_WHO")]
@@ -29,8 +28,7 @@ namespace DigitalData.UserManager.Domain.Entities
 #if NET7_0_OR_GREATER
             ?
 #endif
-            ChangedWho
-        { get; set; }
+            ChangedWho { get; set; }
 
         //TODO: assign it to default value in create dto, not here!
         [Column("ADDED_WHEN", TypeName = "datetime")]
diff --git a/DigitalData.UserManager.Domain/Entities/ClientUser.cs b/DigitalData.UserManager.Domain/Entities/ClientUser.cs
index 58a575b..43eeafc 100644
--- a/DigitalData.UserManager.Domain/Entities/ClientUser.cs
+++ b/DigitalData.UserManager.Domain/Entities/ClientUser.cs
@@ -28,8 +28,7 @@ namespace DigitalData.UserManager.Domain.Entities
 #if NET7_0_OR_GREATER
             ?
 #endif
-            Comment
-        { get; set; }
+            Comment { get; set; }
 
         [StringLength(50)]
         [Column("ADDED_WHO")]
@@ -37,8 +36,7 @@ namespace DigitalData.UserManager.Domain.Entities
 #if NET7_0_OR_GREATER
             ?
 #endif
-            AddedWho
-        { get; set; }
+            AddedWho { get; set; }
 
         [Column("ADDED_WHEN", TypeName = "datetime")]
         [DefaultValue("GETDATE()")]
diff --git a/DigitalData.UserManager.Domain/Entities/Group.cs b/DigitalData.UserManager.Domain/Entities/Group.cs
index b20051e..af157c8 100644
--- a/DigitalData.UserManager.Domain/Entities/Group.cs
+++ b/DigitalData.UserManager.Domain/Entities/Group.cs
@@ -32,8 +32,7 @@ namespace DigitalData.UserManager.Domain.Entities
 #if NET7_0_OR_GREATER
             ?
 #endif
-            Comment
-        { get; set; }
+            Comment { get; set; }
 
         // TODO: this column should be assigned by triggers. despite this it is not null and this is problem for creation. talk with others
         [Required]
diff --git a/DigitalData.UserManager.Domain/Entities/User.cs b/DigitalData.UserManager.Domain/Entities/User.cs
index dfc181b..9f25833 100644
--- a/DigitalData.UserManager.Domain/Entities/User.cs
+++ b/DigitalData.UserManager.Domain/Entities/User.cs
@@ -26,7 +26,11 @@ namespace DigitalData.UserManager.Domain.Entities
         [Required]
         [Column("USERNAME")]
         [StringLength(50)]
-        public string Username { get; set; }
+        public
+#if NET7_0_OR_GREATER
+            required
+#endif
+            string Username { get; set; }
 
         [Column("SHORTNAME")]
         [StringLength(30)]