diff --git a/app/models/communication/website/localization.rb b/app/models/communication/website/localization.rb
index 1937d46f7b58e25ddb5d476f6557a89f660c0bce..a1d171c3bca1cc713ea10467fc5638dc4ab733ec 100644
--- a/app/models/communication/website/localization.rb
+++ b/app/models/communication/website/localization.rb
@@ -42,7 +42,7 @@ class Communication::Website::Localization < ApplicationRecord
 
   validates :language_id, uniqueness: { scope: :communication_website_id }
 
-  before_validation :set_university_id
+  before_validation :set_university_id, on: :create
 
   # Localization is not directly exportable to git
   # Whereas the languages config in the dependencies is exportable to git
@@ -54,7 +54,7 @@ class Communication::Website::Localization < ApplicationRecord
     [website.config_default_languages]
   end
 
-  def to_s
+  def computed_name
     name.present? ? "#{name}" : website.to_s
   end
 
diff --git a/app/views/admin/communication/websites/configs/default_languages/static.html.erb b/app/views/admin/communication/websites/configs/default_languages/static.html.erb
index c85d7645f42e8f4da8f09facb2d2bac587607240..619e265e0655bc14789835070394daf0edc5044d 100644
--- a/app/views/admin/communication/websites/configs/default_languages/static.html.erb
+++ b/app/views/admin/communication/websites/configs/default_languages/static.html.erb
@@ -5,7 +5,7 @@
   localization = @website.localization_for(language)
 %>
 <%= language.iso_code %>:
-  title: <%= localization %>
+  title: <%= localization.computed_name %>
   contentDir: content/<%= language.iso_code %>
   languageCode: <%= language.iso_code %>
   languageName: <%= language.name %>
@@ -24,12 +24,12 @@
       :instagram,
       :facebook,
       :tiktok
-      ].each do |network|
-      value = localization.public_send "social_#{network}"
-      value = @website.public_send "social_#{network}" if value.blank?
+      ].each do |social_element|
+      value = localization.public_send "social_#{social_element}"
+      value = @website.public_send "social_#{social_element}" if value.blank?
       next if value.blank?
       -%>
-      <%= network %>: >-
+      <%= social_element %>: >-
         <%= value %>
       <%- end -%>
   permalinks:
diff --git a/app/views/admin/communication/websites/static.html.erb b/app/views/admin/communication/websites/static.html.erb
index f1c6884b2ec02687da51b5998e3bedbca05070a6..8bc86ef5bd4417733ecf792d3239c40b34d7fdb1 100644
--- a/app/views/admin/communication/websites/static.html.erb
+++ b/app/views/admin/communication/websites/static.html.erb
@@ -18,10 +18,10 @@ social:
   :instagram,
   :facebook,
   :tiktok
-].each do |network|
-  value = @website.send "social_#{network}"
+].each do |social_element|
+  value = @website.send "social_#{social_element}"
   next if value.blank?
 %>
-  <%= network %>: >-
+  <%= social_element %>: >-
     <%= value %>
 <% end %>
\ No newline at end of file