diff --git a/install/src/org/compiere/install/SetupRes.java b/install/src/org/compiere/install/SetupRes.java
index 5b539ed37c..76424554be 100644
--- a/install/src/org/compiere/install/SetupRes.java
+++ b/install/src/org/compiere/install/SetupRes.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                        *
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
  * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software; you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
@@ -54,8 +54,8 @@ public class SetupRes extends ListResourceBundle
 	{ "DatabasePassword", 		"Database Password" },
 	{ "TNSNameInfo", 			"Discovered Databases" },
 	{ "TNSName", 				"Database Search" },
-	{ "SystemPasswordInfo", 	"Database System User Password" },
-	{ "SystemPassword", 		"System Password" },
+	{ "SystemPasswordInfo", 	"Database Administrator User Password" },
+	{ "SystemPassword", 		"DB Admin Password" },
 	{ "MailServerInfo", 		"Mail Server" },
 	{ "MailServer", 			"Mail Server" },
 	{ "AdminEMailInfo", 		"Adempiere Administrator EMail" },
diff --git a/install/src/org/compiere/install/SetupRes_es.java b/install/src/org/compiere/install/SetupRes_es.java
index a141d17cf3..c1ea098ca8 100644
--- a/install/src/org/compiere/install/SetupRes_es.java
+++ b/install/src/org/compiere/install/SetupRes_es.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Product: Adempiere ERP & CRM Smart Business Solution                        *
+ * Product: Adempiere ERP & CRM Smart Business Solution                       *
  * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software; you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
@@ -54,8 +54,8 @@ public class SetupRes_es extends ListResourceBundle
 	{ "DatabasePassword", 		"Contrase\u00f1a Base de Datos" },
 	{ "TNSNameInfo", 			"Bases de Datos Encontradas" },
 	{ "TNSName", 				"Buscar Bases de Datos" },
-	{ "SystemPasswordInfo", 	"Contrase\u00f1a Usuario System" },
-	{ "SystemPassword", 		"Contrase\u00f1a System" },
+	{ "SystemPasswordInfo", 	"Contrase\u00f1a Usuario Administrador de Base de Datos" },
+	{ "SystemPassword", 		"Contrase\u00f1a Admin BD" },
 	{ "MailServerInfo", 		"Servidor Correo" },
 	{ "MailServer", 			"Servidor Correo" },
 	{ "AdminEMailInfo", 		"Email Administrador Adempiere" },