diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html
index 1c56f8568..cda0ad03b 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motion/templates/motion/motion_detail.html
@@ -4,14 +4,14 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} – {% trans "Motion" %} {{ motion.number }}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Motion" %} {{ motion.identifier }}{% endblock %}
 
 {% block content %}
 <h1>
     {{ motion.title }} {{ motion.category }}
     <br>
     <small>
-    {% if motion.identifier != None %}
+    {% if motion.identifier %}
         {% trans "Motion" %} {{ motion.identifier }},
     {% else %}
         <i>[{% trans "no number" %}]</i>,
diff --git a/openslides/motion/templates/motion/motion_diff.html b/openslides/motion/templates/motion/motion_diff.html
index 65ceec68f..f03d54b85 100644
--- a/openslides/motion/templates/motion/motion_diff.html
+++ b/openslides/motion/templates/motion/motion_diff.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} – {% trans "Motion" %} {{ motion.number }}{% endblock %}
+{% block title %}{{ block.super }} – {% trans "Motion" %} {{ motion.identifier }}{% endblock %}
 
 {% block header %}
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/motion.css' %}" />
@@ -16,8 +16,8 @@
     {{ motion.title }}
     <br>
     <small>
-    {% if motion.number != None %}
-        {% trans "Motion" %} {{ motion.number }},
+    {% if motion.identifier != None %}
+        {% trans "Motion" %} {{ motion.identifier }},
     {% else %}
         <i>[{% trans "no number" %}]</i>,
     {% endif %}
diff --git a/openslides/motion/templates/motion/motion_list.html b/openslides/motion/templates/motion/motion_list.html
index 09b8c8a34..bc5d630c9 100644
--- a/openslides/motion/templates/motion/motion_list.html
+++ b/openslides/motion/templates/motion/motion_list.html
@@ -61,7 +61,7 @@
         </tr>
     {% for motion in motion_list %}
         <tr class="{% if motion.active %}activeline{% endif %}">
-            <td>{{ motion.number }}</td>
+            <td>{{ motion.identifier }}</td>
             <td><a href="{% model_url motion %}">{{ motion.title }}</a></td>
         {% if min_supporters > 0 %}
             <td class="optional">{# motion.count_supporters #}</td>
diff --git a/openslides/motion/templates/motion/poll_form.html b/openslides/motion/templates/motion/poll_form.html
index f3bc4aa68..70030bf28 100644
--- a/openslides/motion/templates/motion/poll_form.html
+++ b/openslides/motion/templates/motion/poll_form.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 
 {% block title %}
-    {{ block.super }} - {% trans "Motion" %} {{ motion.number }}, {{ ballot }}. {% trans "Vote" %}
+    {{ block.super }} - {% trans "Motion" %} {{ motion.identifier }}, {{ ballot }}. {% trans "Vote" %}
 {% endblock %}
 
 {% block content %}
@@ -11,7 +11,7 @@
     {{ motion }}
     <br>
     <small>
-    {% trans "Motion" %} {{ motion.number }}, {{ ballot }}. {% trans "Vote" %}
+    {% trans "Motion" %} {{ motion.identifier }}, {{ ballot }}. {% trans "Vote" %}
     </small>
     <small class="pull-right">
     <div class="btn-toolbar">
diff --git a/openslides/motion/templates/motion/widget.html b/openslides/motion/templates/motion/widget.html
index 37302db51..3c9566403 100644
--- a/openslides/motion/templates/motion/widget.html
+++ b/openslides/motion/templates/motion/widget.html
@@ -17,8 +17,8 @@
             {{ motion.public_version.title }}
         </a>
         ({% trans "motion" %}
-        {% if motion.number %}
-            {{ motion.number }})
+        {% if motion.identifier %}
+            {{ motion.identifier }})
         {% else %}
             <i>[{% trans "no number" %}]</i>)
         {% endif %}
diff --git a/openslides/motion/templates/projector/Motion.html b/openslides/motion/templates/projector/Motion.html
index 8d2e6699e..20f2b97be 100644
--- a/openslides/motion/templates/projector/Motion.html
+++ b/openslides/motion/templates/projector/Motion.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{ block.super }} - {% trans "Motion" %} {{ motion.number }}{% endblock %}
+{% block title %}{{ block.super }} - {% trans "Motion" %} {{ motion.identifier }}{% endblock %}
 {% block content %}
     <div id="sidebar">
     <div class="box">
@@ -59,8 +59,8 @@
     </div>
 
     <h1>
-    {% if motion.number != None %}
-        {% trans "Motion No." %} {{ motion.number }}
+    {% if motion.identifier %}
+        {% trans "Motion No." %} {{ motion.identifier }}
     {% else %}
         {% trans "Motion" %} <i>[{% trans "no number" %}]</i>
     {% endif %}
diff --git a/openslides/participant/templates/participant/personal_info_widget.html b/openslides/participant/templates/participant/personal_info_widget.html
index 6be7d58eb..e5d8ffde0 100644
--- a/openslides/participant/templates/participant/personal_info_widget.html
+++ b/openslides/participant/templates/participant/personal_info_widget.html
@@ -7,8 +7,8 @@
         <li>
             <a href="{% model_url motion 'view' %}">{{ motion.public_version.title }}</a>
             ({% trans "motion" %}
-            {% if motion.number %}
-                {{ motion.number }})
+            {% if motion.identifier %}
+                {{ motion.identifier }})
             {% else %}
                 <i>[{% trans "no number" %}]</i>)
             {% endif %}
@@ -26,8 +26,8 @@
         <li>
             <a href="{% model_url motion 'view' %}">{{ motion.public_version.title }}</a>
             ({% trans "motion" %}
-            {% if motion.number %}
-                {{ motion.number }})
+            {% if motion.identifier %}
+                {{ motion.identifier }})
             {% else %}
                 <i>[{% trans "no number" %}]</i>)
             {% endif %}