diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index e965871d684492c390ce9e817e17f47e96adcf9c..4e0172311e20122c15fa8c0ebfd83f39fad71049 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -59,14 +59,17 @@ ServerConnector.registerListenerType("onDataLoadStop");
 ServerConnector.init();
 ServerConnector.getMinOverlayColorInt = function () {
   var self = this;
-  var userColor;
-  return self.getLoggedUser().then(function (user) {
-    userColor = user.getMinColor();
-    return self.getConfigurationParam(ConfigurationType.MIN_COLOR_VAL);
-  }).then(function (systemMinColor) {
+  return self.getLoggedUser().then(function(user) {
+    var userColor = user.getMinColor();
+    return self.returnUserOrSystemColor(userColor, self.getConfigurationParam(ConfigurationType.MIN_COLOR_VAL));
+  });
+};
+
+ServerConnector.returnUserOrSystemColor = function(userColor, systemPromisedColor) {
+  return systemPromisedColor.then(function(systemColor) {
     var color = userColor;
     if (userColor === null || userColor === undefined || userColor === "") {
-      color = systemMinColor;
+      color = systemColor;
     }
     color = parseInt(color, 16);
     /* jslint bitwise: true */
@@ -77,37 +80,17 @@ ServerConnector.getMinOverlayColorInt = function () {
 
 ServerConnector.getSimpleOverlayColorInt = function () {
   var self = this;
-  var userColor;
-  return self.getLoggedUser().then(function (user) {
-    userColor = user.getSimpleColor();
-    return self.getConfigurationParam(ConfigurationType.SIMPLE_COLOR_VAL);
-  }).then(function (systemSimpleColor) {
-    var color = userColor;
-    if (userColor === null || userColor === undefined || userColor === "") {
-      color = systemSimpleColor;
-    }
-    color = parseInt(color, 16);
-    /* jslint bitwise: true */
-    color = (color & 0xFFFFFF);
-    return color;
+  return self.getLoggedUser().then(function(user) {
+    var userColor = user.getSimpleColor();
+    return self.returnUserOrSystemColor(userColor, self.getConfigurationParam(ConfigurationType.SIMPLE_COLOR_VAL));
   });
 };
 
-ServerConnector.getMaxOverlayColorInt = function () {
+ServerConnector.getMaxOverlayColorInt = function() {
   var self = this;
-  var userColor;
-  return self.getLoggedUser().then(function (user) {
-    userColor = user.getMaxColor();
-    return self.getConfigurationParam(ConfigurationType.MAX_COLOR_VAL);
-  }).then(function (systemMaxColor) {
-    var color = userColor;
-    if (userColor === null || userColor === undefined || userColor === "") {
-      color = systemMaxColor;
-    }
-    color = parseInt(color, 16);
-    /* jslint bitwise: true */
-    color = (color & 0xFFFFFF);
-    return color;
+  return self.getLoggedUser().then(function(user) {
+    var userColor = user.getMaxColor();
+    return self.returnUserOrSystemColor(userColor, self.getConfigurationParam(ConfigurationType.MAX_COLOR_VAL));
   });
 };
 
diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
index 1c70a7d3bdf5b0133d1fc094e838adcc2be7b4c1..2e000de1e9c6494418c305daecf08b58e5a97013 100644
--- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
+++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js
@@ -5,7 +5,7 @@
 var AbstractGuiElement = require('../AbstractGuiElement');
 var GuiConnector = require('../../GuiConnector');
 
-var Functions = require('../../functions');
+var Functions = require('../../Functions');
 var logger = require('../../logger');
 
 var guiUtils = new (require('../leftPanel/GuiUtils'))();