diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
index 5352a18a5..e32b84a8d 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
@@ -292,8 +292,8 @@ public class PersistenceUnitInfoImpl
                     setNonJtaDataSourceName((String) val);
                 else
                     setNonJtaDataSource((DataSource) val);
-            } else if (key instanceof String && val instanceof String)
-                setProperty((String) key, (String) val);
+            } else
+                _props.put(key, val);
         }
     }