diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index b0a8989b0b9298d9b9659b8fd7d923d7f0c42bac..6b666a863eeffea0a66a4bb64a94184c0a54eaac 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -1475,8 +1475,15 @@ function install_web_admin_webmail {
 
     cp "/root/${PROJECT_NAME}/webadmin/images/logo_webmail.png" "/var/www/${local_hostname}/htdocs/mail/images/sm_logo.png"
 
-    sed -i 's|SquirrelMail version %s||g' "/var/www/${local_hostname}/htdocs/mail/functions/display_messages.php"
-    sed -i "s|By the SquirrelMail Project Team|http://$(cat /var/lib/tor/hidden_service_webadmin/hostname)/mail|g" "/var/www/${local_hostname}/htdocs/mail/functions/display_messages.php"
+    replace_str='SquirrelMail version %s'
+    replace_str_new="http://$(cat /var/lib/tor/hidden_service_webadmin/hostname)/mail"
+    sed -i "s|$replace_str|$replace_str_new|g" "/var/www/${local_hostname}/htdocs/mail/functions/display_messages.php"
+
+    replace_str='By the SquirrelMail Project Team'
+    replace_str_new=''
+    sed -i "s|$replace_str|$replace_str_new|g" "/var/www/${local_hostname}/htdocs/mail/functions/display_messages.php"
+    sed -i "s|$replace_str|$replace_str_new|g" "/var/www/${local_hostname}/htdocs/mail/po/squirrelmail.pot"
+    sed -i "s|$replace_str|$replace_str_new|g" "/var/www/${local_hostname}/htdocs/mail/src/login.php"
 }
 
 function install_web_admin {