diff --git a/app/views/mailers/registrant_change_mailer/accepted.html.erb b/app/views/mailers/registrant_change_mailer/accepted.html.erb
index b56aae53c..0652beb6e 100644
--- a/app/views/mailers/registrant_change_mailer/accepted.html.erb
+++ b/app/views/mailers/registrant_change_mailer/accepted.html.erb
@@ -8,10 +8,7 @@ Domeeni <%= domain.name %> registreerija vahetuse taotlus on kinnitatud ning and
 <br><br>
 Uue registreerija andmed:<br>
 <%= render 'mailers/shared/registrant/registrant.et.html', registrant: new_registrant %>
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -20,6 +17,4 @@ Process for changing registrant of the domain <%= domain.name %> has been approv
 <br><br>
 New registrant:<br>
 <%= render 'mailers/shared/registrant/registrant.en.html', registrant: new_registrant %>
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.html' %>
\ No newline at end of file
diff --git a/app/views/mailers/registrant_change_mailer/accepted.text.erb b/app/views/mailers/registrant_change_mailer/accepted.text.erb
index 2bab1f4c2..44cb7a2cc 100644
--- a/app/views/mailers/registrant_change_mailer/accepted.text.erb
+++ b/app/views/mailers/registrant_change_mailer/accepted.text.erb
@@ -9,9 +9,7 @@ Domeeni <%= domain.name %> registreerija vahetuse taotlus on kinnitatud ning and
 Uue registreerija andmed:
 <%= render 'mailers/shared/registrant/registrant.et.text', registrant: new_registrant %>
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
-
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 --------------------------------------
 
 Hi,
@@ -21,5 +19,4 @@ Process for changing registrant of the domain <%= domain.name %> has been approv
 New registrant:
 <%= render 'mailers/shared/registrant/registrant.en.text', registrant: new_registrant %>
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>
diff --git a/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb b/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb
index a867ffe3d..3371b03d5 100644
--- a/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb
+++ b/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb
@@ -13,10 +13,7 @@ Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatak
 Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:<br>
 
 <%= link_to @confirmation_url, @confirmation_url %>
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -33,6 +30,4 @@ The application will remain in pending status for <%= Setting.expire_pending_con
 <br><br>
 To confirm the update please visit this website, once again review the data and press approve:<br>
 <%= link_to @confirmation_url, @confirmation_url %>
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.html' %>
\ No newline at end of file
diff --git a/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb b/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb
index 6bcc0322b..174527488 100644
--- a/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb
+++ b/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb
@@ -11,8 +11,7 @@ Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatak
 Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
 <%= @confirmation_url %>
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 
 --------------------------------------
 
@@ -29,5 +28,4 @@ The application will remain in pending status for <%= Setting.expire_pending_con
 To confirm the update please visit this website, once again review the data and press approve:
 <%= @confirmation_url %>
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>
\ No newline at end of file
diff --git a/app/views/mailers/registrant_change_mailer/expired.html.erb b/app/views/mailers/registrant_change_mailer/expired.html.erb
index 0d369a970..84cf60e91 100644
--- a/app/views/mailers/registrant_change_mailer/expired.html.erb
+++ b/app/views/mailers/registrant_change_mailer/expired.html.erb
@@ -5,11 +5,7 @@ Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> ei kinnitanud
 Küsimuste korral palun võtke ühendust oma registripidajaga:
 
 <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
-
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -19,7 +15,4 @@ Domain registrant change request has been expired for the domain <%= @domain.nam
 Please contact to your registrar if you have any questions:
 
 <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
-
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.html' %>
\ No newline at end of file
diff --git a/app/views/mailers/registrant_change_mailer/expired.text.erb b/app/views/mailers/registrant_change_mailer/expired.text.erb
index 7ec3fecbd..9b0dac3a6 100644
--- a/app/views/mailers/registrant_change_mailer/expired.text.erb
+++ b/app/views/mailers/registrant_change_mailer/expired.text.erb
@@ -5,9 +5,7 @@ Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> ei kinnitanud
 Küsimuste korral palun võtke ühendust oma registripidajaga:
 
 <%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
-
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 
 --------------------------------------
 
@@ -19,5 +17,4 @@ Please contact to your registrar if you have any questions:
 
 <%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>
\ No newline at end of file
diff --git a/app/views/mailers/registrant_change_mailer/notification.html.erb b/app/views/mailers/registrant_change_mailer/notification.html.erb
index 6aecaf0b3..0af7a468d 100644
--- a/app/views/mailers/registrant_change_mailer/notification.html.erb
+++ b/app/views/mailers/registrant_change_mailer/notification.html.erb
@@ -14,9 +14,7 @@ Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule
 <br><br>
 Juhul kui <%= @current_registrant.name %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
 <br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -34,6 +32,4 @@ New registrant:<br>
 The registrant change procedure will be completed only after the current registrant <%= @current_registrant.name %> has approved it.
 <br><br>
 Change request will be cancelled in case <%= @current_registrant.name %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours.
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.html' %>
\ No newline at end of file
diff --git a/app/views/mailers/registrant_change_mailer/notification.text.erb b/app/views/mailers/registrant_change_mailer/notification.text.erb
index bd1fb5d0f..724777a59 100644
--- a/app/views/mailers/registrant_change_mailer/notification.text.erb
+++ b/app/views/mailers/registrant_change_mailer/notification.text.erb
@@ -13,8 +13,7 @@ Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule
 
 Juhul kui <%= @current_registrant.name %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 
 --------------------------------------
 
@@ -33,5 +32,4 @@ The registrant change procedure will be completed only after the current registr
 
 Change request will be cancelled in case <%= @current_registrant.name %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours.
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>
diff --git a/app/views/mailers/registrant_change_mailer/rejected.html.erb b/app/views/mailers/registrant_change_mailer/rejected.html.erb
index 2521dd52a..ee679daa7 100644
--- a/app/views/mailers/registrant_change_mailer/rejected.html.erb
+++ b/app/views/mailers/registrant_change_mailer/rejected.html.erb
@@ -5,11 +5,7 @@ Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> on domeeni reg
 Küsimuste korral võtke palun ühendust oma registripidajaga:
 
 <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
-
-<br><br>
-Lugupidamisega<br>
-Eesti Interneti Sihtasutus
-<br><br>
+<%= render 'mailers/shared/signatures/signature.et.html' %>
 <hr>
 <br><br>
 Hi,
@@ -19,7 +15,4 @@ Registrant change for the domain <%= @domain.name %> was rejected by the registr
 Please contact your registrar if you have any questions:
 
 <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
-
-<br><br>
-Best Regards,<br>
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.html' %>
\ No newline at end of file
diff --git a/app/views/mailers/registrant_change_mailer/rejected.text.erb b/app/views/mailers/registrant_change_mailer/rejected.text.erb
index 166f6f394..7728b5a4c 100644
--- a/app/views/mailers/registrant_change_mailer/rejected.text.erb
+++ b/app/views/mailers/registrant_change_mailer/rejected.text.erb
@@ -6,8 +6,7 @@ Küsimuste korral võtke palun ühendust oma registripidajaga:
 
 <%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
 
-Lugupidamisega
-Eesti Interneti Sihtasutus
+<%= render 'mailers/shared/signatures/signature.et.text' %>
 
 --------------------------------------
 
@@ -19,5 +18,4 @@ Please contact your registrar if you have any questions:
 
 <%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %>
 
-Best Regards,
-Estonian Internet Foundation
+<%= render 'mailers/shared/signatures/signature.en.text' %>