diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd69635dc..caf733e82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 - repro: Use firewalld provided SIP services.
+- xmpp: Show more clearly if domain is not set.
 
 ## [0.11.0] - 2016-09-21
 ### Added
diff --git a/plinth/modules/xmpp/templates/xmpp.html b/plinth/modules/xmpp/templates/xmpp.html
index b987335bd..4e546c455 100644
--- a/plinth/modules/xmpp/templates/xmpp.html
+++ b/plinth/modules/xmpp/templates/xmpp.html
@@ -29,15 +29,15 @@
   <p>
     {% url 'config:index' as index_url %}
     {% if domainname %}
-    {% blocktrans trimmed with domainname=domainname %}
-      Your XMPP server domain is set to <b>{{ domainname }}</b>. User
-      IDs will look like <i>username@{{ domainname }}</i>. You
-      can setup your domain on the system
-      <a href="{{ index_url }}">Configure</a> page.
-    {% endblocktrans %}
-    {% else %}
-    Your XMPP is not set up yet, you can setup your domain on the system
+      {% blocktrans trimmed with domainname=domainname %}
+        Your XMPP server domain is set to <b>{{ domainname }}</b>. User
+        IDs will look like <i>username@{{ domainname }}</i>. You
+        can setup your domain on the system
         <a href="{{ index_url }}">Configure</a> page.
+      {% endblocktrans %}
+    {% else %}
+      Your XMPP server domain is not set. You can setup your domain on
+      the system <a href="{{ index_url }}">Configure</a> page.
     {% endif %}
   </p>