diff --git a/CHANGELOG b/CHANGELOG
index 5e1ad1f12dff4b36fa26185e424a60db822d13c8..120e6961d4bcd59292c2147b0ad4f0ea65d5e603 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,8 @@ minerva (14.0.0~beta.0) unstable; urgency=low
   * Bug fix: width of info window adjust to the content size (#903)
   * Bug fix: when uploading generic data overlay the type was not updated in
     case the type was not specified in the input file (#906)
+  * Bug fix: list of types when copying from annotators contains only types
+    that are selectable in the dialog (#911)
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 21 Aug 2019 21:00:00 +0200
 
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index d72b9c46652e9a14181f4019c585dd0d076d84c9..7fc0fc8ff0f4321ce69afca48f3b1378e57a16fc 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -188,7 +188,6 @@ ServerConnector.isSessionValid = function () {
     //this is workaround for the problem with Firefox Private Window issue
     //in FF new tab is opened with existing cookies but localStorage is cleared
     if (sessionLogin === undefined || sessionLogin === null) {
-      console.log("SET USER");
       self.getSessionData(null).setLogin(serverSideLogin);
     }
     return serverSideLogin === self.getSessionData(null).getLogin();
diff --git a/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js b/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js
index 24f5401eff36e35c179635689bfdb3a6c19ee45f..b820fdb80caa004e7b06c75d03e1971038dbd1c4 100644
--- a/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js
+++ b/frontend-js/src/main/js/gui/admin/ChooseAnnotatorsDialog.js
@@ -163,16 +163,13 @@ ChooseAnnotatorsDialog.prototype.setElementType = function (elementType) {
     var copyFromSelect = Functions.createElement({type: "select", style: "margin:5px"});
     element.appendChild(copyFromSelect);
     var options = [], i;
-    for (i = 0; i < configuration.getElementTypes().length; i++) {
-      var type = configuration.getElementTypes()[i];
-      var name = type.className;
-      if (name.indexOf(".") > 0) {
-        name = name.substr(name.lastIndexOf(".") + 1);
-      }
+    var nodeList = self.getTypeNodeList();
+    for (i = 0; i < nodeList.length; i++) {
+      var type = nodeList[i];
       options.push(Functions.createElement({
         type: "option",
-        value: type.className,
-        content: name
+        value: type.data.className,
+        content: type.text
       }));
     }
     options.sort(function (a, b) {
@@ -567,8 +564,8 @@ ChooseAnnotatorsDialog.prototype.getParameterName = function (parameter) {
 ChooseAnnotatorsDialog.prototype.copyAnnotatorsToChildren = function (from, to, user) {
   if (user.getPreferences()._elementAnnotators[from.className] === undefined) {
     logger.warn("Cannot copy annotator from " + from.className + " to " + to.className + ". Annotators don't exist");
-    user.getPreferences()._elementAnnotators[from.className] = user.getPreferences()._elementAnnotators[to.className];
+    user.getPreferences()._elementAnnotators[from.className] = user.getPreferences().getElementAnnotators(to.className);
   }
-  user.getPreferences()._elementAnnotators[to.className] = user.getPreferences()._elementAnnotators[from.className];
+  user.getPreferences()._elementAnnotators[to.className] = user.getPreferences().getElementAnnotators(from.className);
 };
 module.exports = ChooseAnnotatorsDialog;
diff --git a/frontend-js/src/main/js/map/data/UserPreferences.js b/frontend-js/src/main/js/map/data/UserPreferences.js
index 894634381da648bb9d43f91f95edd6ceb80befe0..4639619c0e48e5a0dac3319f20f9fbf8beefc7a5 100644
--- a/frontend-js/src/main/js/map/data/UserPreferences.js
+++ b/frontend-js/src/main/js/map/data/UserPreferences.js
@@ -21,6 +21,9 @@ function UserPreferences(javaObject) {
     this.setGuiPreferences(javaObject["gui-preferences"]);
   } else {
     this._projectUpload = {};
+    /**
+     * @private
+     */
     this._elementAnnotators = {};
     this._elementRequiredAnnotations = {};
     this._elementValidAnnotations = {};
@@ -42,7 +45,7 @@ UserPreferences.prototype.update = function (userPreferences) {
   };
 
   updateDict(this._projectUpload, userPreferences.getProjectUpload());
-  updateDict(this._elementAnnotators, userPreferences.getElementAnnotators);
+  updateDict(this._elementAnnotators, userPreferences._elementAnnotators);
   updateDict(this._elementValidAnnotations, userPreferences._elementValidAnnotations);
   updateDict(this._elementRequiredAnnotations, userPreferences._elementRequiredAnnotations);
   updateDict(this._guiPreferences, userPreferences.getGuiPreferences());