diff --git a/CHANGES.txt b/CHANGES.txt
index 5a98a761f8..4fe82e1856 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Merged from 3.0:
  * Add missing commands to nodetool_completion (CASSANDRA-14916)
  * Anti-compaction temporarily corrupts sstable state for readers (CASSANDRA-15004)
 Merged from 2.2:
+ * Fixing invalid CQL in security documentation (CASSANDRA-15020)
  * Make tools/bin/token-generator py2/3 compatible (CASSANDRA-15012)
  * Multi-version in-JVM dtests (CASSANDRA-14937)
 
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 61b9d63951..735cfe19b5 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -1413,17 +1413,17 @@ bc(sample)..
 CREATE USER alice WITH PASSWORD 'password_a' SUPERUSER;
 CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true AND SUPERUSER = true;
 
-CREATE USER IF EXISTS alice WITH PASSWORD 'password_a' SUPERUSER;
-CREATE ROLE IF EXISTS alice WITH PASSWORD = 'password_a' AND LOGIN = true AND SUPERUSER = true;
+CREATE USER IF NOT EXISTS alice WITH PASSWORD 'password_a' SUPERUSER;
+CREATE ROLE IF NOT EXISTS alice WITH PASSWORD = 'password_a' AND LOGIN = true AND SUPERUSER = true;
 
 CREATE USER alice WITH PASSWORD 'password_a' NOSUPERUSER;
 CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true AND SUPERUSER = false;
 
 CREATE USER alice WITH PASSWORD 'password_a' NOSUPERUSER;
-CREATE ROLE alice WITH PASSWORD = 'password_a' WITH LOGIN = true;
+CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true;
 
 CREATE USER alice WITH PASSWORD 'password_a';
-CREATE ROLE alice WITH PASSWORD = 'password_a' WITH LOGIN = true;
+CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true;
 p. 
 
 h3(#alterUserStmt). ALTER USER 
diff --git a/doc/source/cql/security.rst b/doc/source/cql/security.rst
index 9efe27f2df..099fcc48e0 100644
--- a/doc/source/cql/security.rst
+++ b/doc/source/cql/security.rst
@@ -227,17 +227,17 @@ statements are equivalent::
     CREATE USER alice WITH PASSWORD 'password_a' SUPERUSER;
     CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true AND SUPERUSER = true;
 
-    CREATE USER IF EXISTS alice WITH PASSWORD 'password_a' SUPERUSER;
-    CREATE ROLE IF EXISTS alice WITH PASSWORD = 'password_a' AND LOGIN = true AND SUPERUSER = true;
+    CREATE USER IF NOT EXISTS alice WITH PASSWORD 'password_a' SUPERUSER;
+    CREATE ROLE IF NOT EXISTS alice WITH PASSWORD = 'password_a' AND LOGIN = true AND SUPERUSER = true;
 
     CREATE USER alice WITH PASSWORD 'password_a' NOSUPERUSER;
     CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true AND SUPERUSER = false;
 
     CREATE USER alice WITH PASSWORD 'password_a' NOSUPERUSER;
-    CREATE ROLE alice WITH PASSWORD = 'password_a' WITH LOGIN = true;
+    CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true;
 
     CREATE USER alice WITH PASSWORD 'password_a';
-    CREATE ROLE alice WITH PASSWORD = 'password_a' WITH LOGIN = true;
+    CREATE ROLE alice WITH PASSWORD = 'password_a' AND LOGIN = true;
 
 .. _alter-user-statement: