diff --git a/db/postgresql/issue566_global_names.sql b/db/postgresql/issue566_global_names.sql
new file mode 100644
index 0000000000000000000000000000000000000000..cee018828ab57d1d0c9b23d9b3367260447e333f
--- /dev/null
+++ b/db/postgresql/issue566_global_names.sql
@@ -0,0 +1,6 @@
+
+ALTER TABLE ONLY global_disciplines
+    DROP CONSTRAINT global_extid_key;
+
+ALTER TABLE ONLY global_disciplines
+    ADD CONSTRAINT global_extid_key UNIQUE (externalid);
\ No newline at end of file
diff --git a/media/js/discipline/journal.js b/media/js/discipline/journal.js
index 5c6d8d6db2974261225e3ab9b18581a2a5cecbee..b4b1e5dcb9355e34e06113e69404d61337a18ae8 100644
--- a/media/js/discipline/journal.js
+++ b/media/js/discipline/journal.js
@@ -382,7 +382,7 @@ $(() => {
         $elem.datepicker({
             dateFormat: 'dd-mm',
             changeMonth: true,
-            changeYear: false,
+            changeYear: true,
             defaultDate: defaultDate,
             //timeFormat: 'HH:mm:ss',
             beforeShow: function () {
@@ -459,7 +459,7 @@ $(() => {
         $elem.datepicker({
             dateFormat: 'dd-mm',
             changeMonth: true,
-            changeYear: false,
+            changeYear: true,
             defaultDate: defaultDate,
             //timeFormat: 'HH:mm:ss',
             beforeShow: function () {