diff --git a/sbroad/doc/sql/query.ebnf b/sbroad/doc/sql/query.ebnf
index c38100a648bb103516a18c4f1d74ed9b7a848714..a840452220d9a49d3c8dedaa5eb41dc468d6cb07 100644
--- a/sbroad/doc/sql/query.ebnf
+++ b/sbroad/doc/sql/query.ebnf
@@ -176,8 +176,7 @@ create_table   ::= 'CREATE' 'TABLE' ('IF' 'NOT' 'EXISTS')? table
                    (('DISTRIBUTED' (('BY' '(' column (',' column)* ')' ('IN' 'TIER' tier)?) | 'GLOBALLY'))?)?
                    ('WAIT' 'APPLIED' ('GLOBALLY' | 'LOCALLY'))?
                    ('OPTION' '(' ('TIMEOUT' '=' double)')')?
-create_user    ::= 'CREATE' 'USER' ('IF' 'NOT' 'EXISTS')? user 'WITH'? 'PASSWORD' "'" password "'"
-                   ('USING' ('CHAP-SHA1' | 'LDAP' | 'MD5'))?
+create_user    ::= 'CREATE' 'USER' ('IF' 'NOT' 'EXISTS')? user (('USING' ('LDAP')) | ('WITH'? 'PASSWORD' "'" password "'" ('USING' ('CHAP-SHA1' | 'MD5')?)?))
 alter_user     ::= 'ALTER' 'USER' user
                    'WITH'? (
                        'LOGIN'