diff --git a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
index 1485385bcac3f9618f4eec0cbc34aa59c987738c..f18490678c52585eaa7481e7b30e3a7b8318459d 100644
--- a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
@@ -54,10 +54,10 @@ public class PresenceGenerator extends AbstractGenerator {
     }
 
     public PresencePacket selfPresence(Account account, Presence.Status status) {
-        return selfPresence(account, status, true);
+        return selfPresence(account, status, true, null);
     }
 
-    public PresencePacket selfPresence(final Account account, final Presence.Status status, final boolean personal) {
+    public PresencePacket selfPresence(final Account account, final Presence.Status status, final boolean personal, final String nickname) {
         final PresencePacket packet = new PresencePacket();
         if (personal) {
             final String sig = account.getPgpSignature();
@@ -72,6 +72,10 @@ public class PresenceGenerator extends AbstractGenerator {
                 packet.addChild("x", "jabber:x:signed").setContent(sig);
             }
         }
+        if (nickname != null) {
+            Element nick = packet.addChild("nick", "http://jabber.org/protocol/nick");
+            nick.setContent(nickname);
+        }
         final String capHash = getCapHash(account);
         if (capHash != null) {
             Element cap = packet.addChild("c",