diff --git a/admin/inc/class.uiserver.inc.php b/admin/inc/class.uiserver.inc.php
index 7845b2eed5..a4ca77712e 100644
--- a/admin/inc/class.uiserver.inc.php
+++ b/admin/inc/class.uiserver.inc.php
@@ -230,11 +230,11 @@
 			{
 				if($GLOBALS['HTTP_GET_VARS']['server_id'])
 				{
-					$GLOBALS['phpgw']->template->set_var('message',lang('Server x has been updated',$server_name));
+					$GLOBALS['phpgw']->template->set_var('message',lang('Server x has been updated',$GLOBALS['HTTP_POST_VARS']['server_name']));
 				}
 				else
 				{
-					$GLOBALS['phpgw']->template->set_var('message',lang('Server x has been added',$server_name));
+					$GLOBALS['phpgw']->template->set_var('message',lang('Server x has been added',$GLOBALS['HTTP_POST_VARS']['server_name']));
 				}
 			}
 			if ((!$GLOBALS['HTTP_POST_VARS']['submit']) && (!$error) && (!$errorcount))