diff --git a/js/actions/_api/user/app.js b/js/actions/_api/user/app.js
index f88d8e2006..9bfa1ac14a 100644
--- a/js/actions/_api/user/app.js
+++ b/js/actions/_api/user/app.js
@@ -36,11 +36,6 @@ function get_api_user(req, res) {
     return;
   }
 
-  if (req.suffix.length !== 1) {
-    actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER);
-    return;
-  }
-
   var user = decodeURIComponent(req.suffix[0]);
 
   try {
@@ -81,6 +76,8 @@ function get_api_config(req, res, key) {
 function get_api_user_or_config(req, res) {
   if (req.suffix.length === 0) {
     get_api_user(req, res);
+  } else if (req.suffix.length === 1) {
+    get_api_user(req, res);
   } else if (req.suffix.length === 2) {
     if (req.suffix[1] === "config") {
       get_api_config(req, res, null);
diff --git a/lib/ProgramOptions/Translator.cpp b/lib/ProgramOptions/Translator.cpp
index ad2e8463a4..4f86266c3a 100644
--- a/lib/ProgramOptions/Translator.cpp
+++ b/lib/ProgramOptions/Translator.cpp
@@ -21,7 +21,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "Translator.h"
-
+#include "Basics/tri-strings.h"
+#include "Basics/files.h"
 std::string arangodb::options::EnvironmentTranslator(std::string const& value) {
   if (value.empty()) {
     return value;