diff --git a/phpgwapi/inc/class.graphics.inc.php b/phpgwapi/inc/class.graphics.inc.php
index 3762b97f8b..a796cd9c07 100644
--- a/phpgwapi/inc/class.graphics.inc.php
+++ b/phpgwapi/inc/class.graphics.inc.php
@@ -63,7 +63,7 @@
 		{
 			if ($_mode == 'graphic' && extension_loaded('gd'))
 			{
-				return '<input type="image" src="/phpgroupware/phpgwapi/templates/default/images/'.$this->createImage($_text).'" border="0" name="'.$_name.'">';
+				return '<input type="image" src="/egroupware/phpgwapi/templates/default/images/'.$this->createImage($_text).'" border="0" name="'.$_name.'">';
 			}
 			else
 			{
diff --git a/phpgwapi/setup/phpgw_da.lang b/phpgwapi/setup/phpgw_da.lang
index ac5ce8ea4a..2c2e471292 100644
--- a/phpgwapi/setup/phpgw_da.lang
+++ b/phpgwapi/setup/phpgw_da.lang
@@ -431,7 +431,6 @@ peru	common	da	Peru
 philippines	common	da	Fillipinerne
 phone	common	da	Telefon
 phone number	common	da	Telefonnummer
-phpgroupware login	login	da	eGroupWare log ind
 pitcairn	common	da	Pitcairn
 please %1 by hand	common	da	Udf�r venligst %1 manuelt
 please enter a name	common	da	Indtast venligst et navn!
diff --git a/phpgwapi/setup/phpgw_es-ca.lang b/phpgwapi/setup/phpgw_es-ca.lang
index 1da2aa1fff..54a722139b 100644
--- a/phpgwapi/setup/phpgw_es-ca.lang
+++ b/phpgwapi/setup/phpgw_es-ca.lang
@@ -435,7 +435,6 @@ personal	common	es-ca	Personal
 peru	common	es-ca	PERU
 philippines	common	es-ca	FILIPINES
 phone number	common	es-ca	N�mero de tel�fon
-phpgroupware login	login	es-ca	Ingreso al Sistema de Groupware
 phpinfo	common	es-ca	PhpInfo
 phpwebhostin	common	es-ca	Manejo Avanzado de Archivos
 pitcairn	common	es-ca	PITCAIRN
diff --git a/phpgwapi/setup/phpgw_hu.lang b/phpgwapi/setup/phpgw_hu.lang
index fafd727044..31705295db 100644
--- a/phpgwapi/setup/phpgw_hu.lang
+++ b/phpgwapi/setup/phpgw_hu.lang
@@ -115,7 +115,6 @@ your settings have been updated	common	hu	A be
 bad login or password	common	hu	Rossz felhaszn�l� vagy jelsz�
 login	login	hu	Bel�p�s
 password	login	hu	Jelsz�
-phpgroupware login	login	hu	eGroupWare bejelentkez�s
 sorry, your login has expired	login	hu	A hozz�f�r�se lej�rt
 use cookies	login	hu	haszn�l s�tit
 username	login	hu	Felhaszn�l�
diff --git a/phpgwapi/setup/phpgw_ja.lang b/phpgwapi/setup/phpgw_ja.lang
index d064dca915..55c4dce42a 100644
--- a/phpgwapi/setup/phpgw_ja.lang
+++ b/phpgwapi/setup/phpgw_ja.lang
@@ -215,7 +215,6 @@ your settings have been updated	common	ja	Your settings have been Updated
 bad login or password	common	ja	�ѥ���ɤ����äƤ��ޤ�
 login	login	ja	��������
 password	login	ja	�ѥ����
-phpgroupware login	login	ja	eGroupWare login
 sorry, your login has expired	login	ja	��������ͭ�����¤��ڤ�ޤ���
 use cookies	login	ja	Cookie �����
 username	login	ja	�桼��̾
diff --git a/phpgwapi/setup/phpgw_zh.lang b/phpgwapi/setup/phpgw_zh.lang
index 3023827150..1ec891aedd 100644
--- a/phpgwapi/setup/phpgw_zh.lang
+++ b/phpgwapi/setup/phpgw_zh.lang
@@ -433,7 +433,7 @@ personal	common	zh	个人
 peru	common	zh	秘鲁
 philippines	common	zh	菲律宾
 phone number	common	zh	电话号码
-phpgroupware: login blocked for user '%1', ip %2	common	zt	eGroupWare：'%1'帳號鎖定了, IP %2
+egroupware: login blocked for user '%1', ip %2	common	zt	eGroupWare：'%1'帳號鎖定了, IP %2
 pitcairn	common	zh	皮特凯恩
 please %1 by hand	common	zh	请手动%1
 please enter a name	common	zh	请输入名称!
diff --git a/phpgwapi/setup/phpgw_zt.lang b/phpgwapi/setup/phpgw_zt.lang
index 67abec0bb8..eacba2475e 100644
--- a/phpgwapi/setup/phpgw_zt.lang
+++ b/phpgwapi/setup/phpgw_zt.lang
@@ -433,7 +433,7 @@ personal	common	zt	個人
 peru	common	zt	PERU
 philippines	common	zt	PHILIPPINES
 phone number	common	zt	電話
-phpgroupware: login blocked for user '%1', ip %2	common	zt	eGroupWare：'%1'帳號鎖定了, IP %2
+egroupware: login blocked for user '%1', ip %2	common	zt	eGroupWare：'%1'帳號鎖定了, IP %2
 pitcairn	common	zt	PITCAIRN
 please %1 by hand	common	zt	請手動 %1
 please enter a name	common	zt	請輸入名稱！