diff --git a/CHANGES.txt b/CHANGES.txt
index 51e624f98b..868aa21871 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
  * 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 5f35d57048..6a05c4f40d 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -1367,17 +1367,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