diff --git a/CHANGES.txt b/CHANGES.txt
index 92ff455a24..0a4726b6c7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -130,6 +130,7 @@
  * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
  * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 Merged from 3.0:
+ * Copy session properties on cqlsh.py do_login (CASSANDRA-13640)
  * Potential AssertionError during ReadRepair of range tombstone and partition deletions (CASSANDRA-13719)
  * Don't let stress write warmup data if n=0 (CASSANDRA-13773)
  * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884)
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 2e10490d14..8ff2116aaa 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1959,6 +1959,12 @@ class Shell(cmd.Cmd):
         else:
             session = conn.connect()
 
+        # Copy session properties
+        session.default_timeout = self.session.default_timeout
+        session.row_factory = self.session.row_factory
+        session.default_consistency_level = self.session.default_consistency_level
+        session.max_trace_wait = self.session.max_trace_wait
+
         # Update after we've connected in case we fail to authenticate
         self.conn = conn
         self.auth_provider = auth_provider