1 files changed, 12 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
index 698a79b34..b5d47edab 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFile.cshtml
@@ -74,12 +74,23 @@ namespace Tango.BL.Entities
                 if (_@(prop.Name.ToLower()) != value)
                 {
                     _@(prop.Name.ToLower()) = value;
+
+                    @if (prop.Complex)
+                    {
+                        <div>
+                            if (@(prop.Name) != null)
+                            {
+                                @(prop.Name)Guid = @(prop.Name).Guid;
+                            }
+                        </div>
+                    }
+
                     @if (!prop.Name.EndsWith("Guid"))
                     {
                         <div>
                             On@(prop.Name)Changed(value);
                         </div>
-                    } 
+                    }
                 }
             }
         }