diff --git a/plinth/modules/users/templates/users_edit.html b/plinth/modules/users/templates/users_edit.html
index dd6aa47ed..f96d80eb6 100644
--- a/plinth/modules/users/templates/users_edit.html
+++ b/plinth/modules/users/templates/users_edit.html
@@ -24,8 +24,9 @@
 
   <h3>Delete Users</h3>
 
-  Currently you can not edit but only delete users from {{ cfg.product_name }}
-  and the {{ cfg.box_name }} system.
+  <p>Currently you can not edit but only delete users from
+    {{ cfg.product_name }} and the {{ cfg.box_name }} system. </p>
+
   <p>Deleting users is permanent!</p>
 
   <form class="form" method="post">
diff --git a/plinth/modules/xmpp/templates/xmpp.html b/plinth/modules/xmpp/templates/xmpp.html
index d8ff3db98..1a8659e47 100644
--- a/plinth/modules/xmpp/templates/xmpp.html
+++ b/plinth/modules/xmpp/templates/xmpp.html
@@ -24,15 +24,14 @@
 
 {% if is_installed %}
 
-<a href='/jwchat' target='_blank'class='btn btn-primary'>
-  Launch web client
-</a>
 <p>XMPP is an open and standardized communication protocol.  Here you
   can run and configure your XMPP server, called ejabberd.  To actually
   communicate, you can use the <a href='/jwchat'>web client</a> or any
   other <a href='http://xmpp.org/xmpp-software/clients/'
   target='_blank'> XMPP client </a>.</p>
 
+<p><a href='/jwchat' target='_blank'class='btn btn-primary'> Launch web
+  client</a></p>
 
 {% else %}