diff --git a/converse.js b/converse.js
index 095b433cf..994348458 100644
--- a/converse.js
+++ b/converse.js
@@ -5788,7 +5788,8 @@
                 } catch (e) {
                     converse.log("Could not restore sessions. Error message: "+e.message);
                 }
-            } else if (this.auto_login) {
+            }
+            if (this.auto_login) {
                 if (!this.jid) {
                     throw new Error("initConnection: If you use auto_login, you also need to provide a jid value");
                 }
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
index 62767c9c2..3a158e643 100644
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+0.9.5 (Unreleased)
+------------------
+
+* #439 auto_login and keepalive not working [jcbrand]
+
 0.9.4 (2015-07-04)
 ------------------