diff --git a/CHANGES.txt b/CHANGES.txt
index 03218b9f59..4a67f9c983 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
  * fix symlinks under data dir not working (CASSANDRA-5185)
  * fix bug in compact storage metadata handling (CASSANDRA-5189)
  * Validate login for USE queries (CASSANDRA-5207)
+ * cli: remove default username and password (CASSANDRA-5208)
 
 1.2.1
  * stream undelivered hints on decommission (CASSANDRA-5128)
diff --git a/src/java/org/apache/cassandra/cli/CliOptions.java b/src/java/org/apache/cassandra/cli/CliOptions.java
index b684cc49ce..fc5eb032dc 100644
--- a/src/java/org/apache/cassandra/cli/CliOptions.java
+++ b/src/java/org/apache/cassandra/cli/CliOptions.java
@@ -136,19 +136,11 @@ public class CliOptions
             {
                 css.username = cmd.getOptionValue(USERNAME_OPTION);
             }
-            else
-            {
-                css.username = "default";
-            }
 
             if (cmd.hasOption(PASSWORD_OPTION))
             {
                 css.password = cmd.getOptionValue(PASSWORD_OPTION);
             }
-            else
-            {
-                css.password = "";
-            }
 
             // Look for keyspace
             if (cmd.hasOption(KEYSPACE_OPTION))