diff --git a/base/src/org/compiere/model/MBPartnerLocation.java b/base/src/org/compiere/model/MBPartnerLocation.java
index 12e37e0e0c..ab1cd46999 100644
--- a/base/src/org/compiere/model/MBPartnerLocation.java
+++ b/base/src/org/compiere/model/MBPartnerLocation.java
@@ -169,7 +169,9 @@ public class MBPartnerLocation extends X_C_BPartner_Location
 			return true;
 		MLocation address = getLocation(true);
 		m_uniqueName = getName();
-		m_unique = 0;
+		m_unique = MSysConfig.getIntValue("START_VALUE_BPLOCATION_NAME", 0, getAD_Client_ID(), getAD_Org_ID());
+		if (m_unique < 0 || m_unique > 4)
+			m_unique = 0;
 		if (m_uniqueName != null && m_uniqueName.equals(".")) {
 			//	default
 			m_uniqueName = null;
@@ -190,6 +192,7 @@ public class MBPartnerLocation extends X_C_BPartner_Location
 				if (m_uniqueName.equals(location.getName()))
 				{
 					//m_uniqueName = null;
+					m_unique++;
 					makeUnique(address);
 					unique = false;
 					break;
@@ -207,20 +210,17 @@ public class MBPartnerLocation extends X_C_BPartner_Location
 	private void makeUnique (MLocation address)
 	{
 		
-		if (m_uniqueName == null)
-			m_uniqueName = "";
-		m_unique++;
-		
+		m_uniqueName = "";
+
 		//	0 - City
-		if (m_uniqueName.length() == 0)
+		if (m_unique >= 0 || m_uniqueName.length() == 0)
 		{
 			String xx = address.getCity(); 
 			if (xx != null && xx.length() > 0)
 				m_uniqueName = xx;
-			m_unique = 0;
 		}
 		//	1 + Address1
-		if (m_unique == 1 || m_uniqueName.length() == 0)
+		if (m_unique >= 1 || m_uniqueName.length() == 0)
 		{
 			String xx = address.getAddress1();
 			if (xx != null && xx.length() > 0)
@@ -229,10 +229,9 @@ public class MBPartnerLocation extends X_C_BPartner_Location
 					m_uniqueName += " ";
 				m_uniqueName += xx;
 			}
-			m_unique = 1;
 		}
 		//	2 + Address2
-		if (m_unique == 2 || m_uniqueName.length() == 0)
+		if (m_unique >= 2 || m_uniqueName.length() == 0)
 		{
 			String xx = address.getAddress2();
 			if (xx != null && xx.length() > 0)
@@ -241,27 +240,25 @@ public class MBPartnerLocation extends X_C_BPartner_Location
 					m_uniqueName += " ";
 				m_uniqueName += xx;
 			}
-			m_unique = 2;
 		}
 		//	3 - Region	
-		if (m_unique == 3 || m_uniqueName.length() == 0)
+		if (m_unique >= 3 || m_uniqueName.length() == 0)
 		{
 			String xx = address.getRegionName(true);
+			if (xx != null && xx.length() > 0)
 			{
 				if (m_uniqueName.length() > 0)
 					m_uniqueName += " ";
 				m_uniqueName += xx;
 			}
-			m_unique = 3;
 		}
 		//	4 - ID	
-		if (m_unique == 4 || m_uniqueName.length() == 0)
+		if (m_unique >= 4 || m_uniqueName.length() == 0)
 		{
 			int id = get_ID();
 			if (id == 0)
 				id = address.get_ID();
 			m_uniqueName += "#" + id;		
-			m_unique = 4;
 		}
 	}	//	makeUnique
 	
diff --git a/migration/353a-trunk/oracle/417_FR2582181.sql b/migration/353a-trunk/oracle/417_FR2582181.sql
new file mode 100644
index 0000000000..6b9f81888f
--- /dev/null
+++ b/migration/353a-trunk/oracle/417_FR2582181.sql
@@ -0,0 +1,5 @@
+-- Feb 9, 2009 12:43:12 PM COT
+-- [2582181 ] Make BPLocation Name generation configurable
+INSERT INTO AD_SysConfig (AD_Client_ID,AD_Org_ID,AD_SysConfig_ID,ConfigurationLevel,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,50017,'O',TO_DATE('2009-02-09 12:43:11','YYYY-MM-DD HH24:MI:SS'),100,'Define the start value for C_BPartner_Location.Name (possible values 0 to 4) - complete definition here http://adempiere.com/wiki/index.php/ManPageW_SystemConfigurator','D','Y','START_VALUE_BPLOCATION_NAME',TO_DATE('2009-02-09 12:43:11','YYYY-MM-DD HH24:MI:SS'),100,'0')
+;
+
diff --git a/migration/353a-trunk/postgresql/417_FR2582181.sql b/migration/353a-trunk/postgresql/417_FR2582181.sql
new file mode 100644
index 0000000000..2bcada3e78
--- /dev/null
+++ b/migration/353a-trunk/postgresql/417_FR2582181.sql
@@ -0,0 +1,5 @@
+-- Feb 9, 2009 12:43:12 PM COT
+-- [2582181 ] Make BPLocation Name generation configurable
+INSERT INTO AD_SysConfig (AD_Client_ID,AD_Org_ID,AD_SysConfig_ID,ConfigurationLevel,Created,CreatedBy,Description,EntityType,IsActive,Name,Updated,UpdatedBy,Value) VALUES (0,0,50017,'O',TO_TIMESTAMP('2009-02-09 12:43:11','YYYY-MM-DD HH24:MI:SS'),100,'Define the start value for C_BPartner_Location.Name (possible values 0 to 4) - complete definition here http://adempiere.com/wiki/index.php/ManPageW_SystemConfigurator','D','Y','START_VALUE_BPLOCATION_NAME',TO_TIMESTAMP('2009-02-09 12:43:11','YYYY-MM-DD HH24:MI:SS'),100,'0')
+;
+