diff --git a/project/static/widget-loader.js b/project/static/widget-loader.js
index e223348..3eee76f 100644
--- a/project/static/widget-loader.js
+++ b/project/static/widget-loader.js
@@ -70,8 +70,16 @@
         resize = getWidgetBoolData(element, 'resize', false);
         googleTagManager = getWidgetBoolData(element, 'google-tag-manager', false);
 
-        var shortName = getWidgetData(element, 'short-name');
-        var src = baseUrl + "/" + shortName + "/widget/eventdates?";
+        var shortName = getWidgetData(element, 'short-name'); // Legacy
+        var organizationId = getWidgetData(element, 'organization-id');
+        var src = baseUrl;
+
+        if (shortName != null) {
+          src += "/" + shortName + "/widget/eventdates?";
+        } else {
+          src += "/organizations/" + organizationId + "/widget/eventdates?";
+        }
+
         src = addParamToQuery(element, src, 'event-list', 'event_list_id');
         src = addParamToQuery(element, src, 'font', 's_ft');
         src = addParamToQuery(element, src, 'background', 's_bg');
diff --git a/project/templates/manage/widgets.html b/project/templates/manage/widgets.html
index c41f2d0..401bb05 100644
--- a/project/templates/manage/widgets.html
+++ b/project/templates/manage/widgets.html
@@ -52,10 +52,10 @@
 <script>(function(w,d,s,o,f,js,fjs){w['EventCallyWidget']=o;w[o]=w[o]||function(){(w[o].q=w[o].q||[]).push(arguments)};js=d.createElement(s),fjs=d.getElementsByTagName(s)[0];js.id=o;js.src=f;js.async=1;fjs.parentNode.insertBefore(js,fjs);}(window,document,'script','eventcally','{{ url_for('static', filename='widget-loader.js', _external=True) }}'));</script>
 <!-- End event calendar widget --></textarea>
                         <p class="mt-3">Füge den folgenden Code an der Stelle im <code>&lt;body&gt;</code> der Seite ein, wo das Widget dargestellt werden soll.</p>
-                        <textarea class="form-control text-monospace" style="font-size: 0.7rem;" disabled rows="3"><div class="eventcally-widget" data-widget-short-name="{{ admin_unit.short_name }}" data-widget-width="100%" data-widget-height="400px" data-widget-resize="true" data-widget-google-tag-manager="false"></div></textarea>
+                        <textarea class="form-control text-monospace" style="font-size: 0.7rem;" disabled rows="3"><div class="eventcally-widget" data-widget-organization-id="{{ admin_unit.id }}" data-widget-width="100%" data-widget-height="400px" data-widget-resize="true" data-widget-google-tag-manager="false"></div></textarea>
                         <p class="mt-3">Mit den folgenden Attributen kann das Widget konfiguriert werden:</p>
                         <ul>
-                            <li><var>data-widget-short-name</var>: Kurzname der Organisation</li>
+                            <li><var>data-widget-organization-id</var>: ID der Organisation</li>
                             <li><var>data-widget-width</var>: iFrame Breite (CSS)</li>
                             <li><var>data-widget-height</var>: iFrame Höhe (CSS)</li>
                             <li><var>data-widget-resize</var>: iFrame Größe automatisch anpassen</li>