diff --git a/commands/src/main/resources/org/wildfly/extras/creaper/commands/datasources/AddDataSource.groovy b/commands/src/main/resources/org/wildfly/extras/creaper/commands/datasources/AddDataSource.groovy
index eebbb24e..17908149 100644
--- a/commands/src/main/resources/org/wildfly/extras/creaper/commands/datasources/AddDataSource.groovy
+++ b/commands/src/main/resources/org/wildfly/extras/creaper/commands/datasources/AddDataSource.groovy
@@ -1,3 +1,9 @@
+// security parameters used as elements: https://issues.redhat.com/browse/WFLY-18324
+stringSubsystemValues = datasources.'@xmlns'.text().tokenize(":")[-1].tokenize(".")
+major = stringSubsystemValues[0].toInteger()
+minor = stringSubsystemValues[1].toInteger()
+securityParamsAsElements = major <= 7 && minor < 2
+
 // attributes of <datasource>
 datasourceAttrs = ['pool-name': poolName]
 if (nn(jta)) datasourceAttrs['jta'] = jta
@@ -44,9 +50,16 @@ def dsDefinition = {
             }
         }
         if (nn(userName, password, securityDomain)) {
-            security {
-                if (nn(userName)) 'user-name'(userName)
-                if (nn(password)) 'password'(password)
+            securityAttrs = [:]
+            if (!securityParamsAsElements) { // see https://issues.redhat.com/browse/WFLY-18324
+                if (nn(userName)) securityAttrs['user-name'] = userName
+                if (nn(password)) securityAttrs['password'] = password
+            }
+            security(securityAttrs) {
+                if (securityParamsAsElements) { // see https://issues.redhat.com/browse/WFLY-18324
+                    if (nn(userName)) 'user-name'(userName)
+                    if (nn(password)) 'password'(password)
+                }
                 if (nn(securityDomain)) 'security-domain'(securityDomain)
             }
         }
diff --git a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/datasources/AddDatasourceOfflineTest.java b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/datasources/AddDatasourceOfflineTest.java
index 5857e1c4..b1b2cade 100644
--- a/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/datasources/AddDatasourceOfflineTest.java
+++ b/testsuite/standalone/src/test/java/org/wildfly/extras/creaper/commands/datasources/AddDatasourceOfflineTest.java
@@ -39,10 +39,7 @@ public class AddDatasourceOfflineTest {
             + "                <datasource pool-name=\"creaper-ds\" jndi-name=\"java:/jboss/datasources/creaper-ds\" enabled=\"false\">\n"
             + "                    <connection-url>jdbc:h2:mem:test-creaper;DB_CLOSE_DELAY=-1;</connection-url>\n"
             + "                    <driver>h2</driver>\n"
-            + "                    <security>\n"
-            + "                      <user-name>creaper</user-name>\n"
-            + "                      <password>creaper</password>\n"
-            + "                    </security>\n"
+            + "                    <security user-name=\"creaper\" password=\"creaper\" />\n"
             + "                </datasource>\n"
             + "            </datasources>\n"
             + "        </subsystem>\n"
@@ -73,10 +70,7 @@ public class AddDatasourceOfflineTest {
             + "                         <flush-strategy>EntirePool</flush-strategy>\n"
             + "                         <allow-multiple-users>true</allow-multiple-users>\n"
             + "                     </pool>\n"
-            + "                     <security>\n"
-            + "                         <user-name>creaper</user-name>\n"
-            + "                         <password>creaper</password>\n"
-            + "                     </security>\n"
+            + "                     <security user-name=\"creaper\" password=\"creaper\" />\n"
             + "                     <validation>\n"
             + "                         <valid-connection-checker class-name=\"org.jboss.jca.adapters.jdbc.extensions.novendor.NullValidConnectionChecker\">\n"
             + "                             <config-property name=\"valid-checker-prop\">ok</config-property>\n"