diff --git a/CHANGELOG b/CHANGELOG
index 72a2864f50..5f8e37a6e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 v2.4.0 (XXXX-XX-XX)
 -------------------
 
+* fixed issue #1134: Change the default endpoint to localhost
+
 * fixed non-working subquery index optimizations
 
 * do not restrict summary of Foxx applications to 60 characters
diff --git a/etc/arangodb/arangod.conf.in b/etc/arangodb/arangod.conf.in
index ff1f694b31..8f7806d7d2 100644
--- a/etc/arangodb/arangod.conf.in
+++ b/etc/arangodb/arangod.conf.in
@@ -26,7 +26,7 @@ directory = @LOCALSTATEDIR@/lib/arangodb
 #   endpoint = tcp://[::]:8529
 #   endpoint = tcp://[fe80::21a:5df1:aede:98cf]:8529
 #
-endpoint = tcp://0.0.0.0:8529
+endpoint = tcp://127.0.0.1:8529
 
 # resuse a port on restart or wait until it is freed by the operating system
 # reuse-address = false
diff --git a/js/server/upgrade-database.js b/js/server/upgrade-database.js
index 4fe254d556..b0f1066dc9 100644
--- a/js/server/upgrade-database.js
+++ b/js/server/upgrade-database.js
@@ -51,6 +51,7 @@ function updateGlobals() {
   var userManager = require("org/arangodb/users");
   var clusterManager = require("org/arangodb/cluster");
   var currentVersion = require("org/arangodb/database-version").CURRENT_VERSION;
+  var sprintf = internal.sprintf;
   var db = internal.db;
 
   function upgrade () {
@@ -758,12 +759,12 @@ function updateGlobals() {
         var results = users.all().toArray().map(function (oldDoc) {
           if (!oldDoc.hasOwnProperty('userData')) {
             if (typeof oldDoc.user !== 'string') {
-              logger.error("user with _key " + oldDoc._key + " has no username");
-              return false;
+              oldDoc.user = "user" + oldDoc._rev;
+              logger.error(sprintf("user with _key %s has no username, using %s instead", oldDoc._key, oldDoc.user));
             }
             if (typeof oldDoc.password !== 'string') {
-              logger.error("user with username " + oldDoc.user + " has no password");
-              return false;
+              logger.error(sprintf("user with username %s has no password", oldDoc.user));
+              oldDoc.password = "$1$e3bdbd05$53e9ff46e996096ced8fefeeecf956da550e0d7d357c8ecdde061994d4d52cee";
             }
             var newDoc = {
               user: oldDoc.user,