diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
index 1a38e5afc..494c1628e 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/sdp/SdpUtils.java
@@ -166,7 +166,7 @@ public static SessionDescription createSessionDescription(
 
             //o
             if (userName == null)
-                userName = "sip-communicator";
+                userName = "jitsi.org";
 
             Origin o = sdpFactory.createOrigin(
                 userName, 0, 0, "IN", addrType, localAddress.getHostAddress());
diff --git a/src/net/java/sip/communicator/service/protocol/media/DynamicPayloadTypeRegistry.java b/src/net/java/sip/communicator/service/protocol/media/DynamicPayloadTypeRegistry.java
index 0a7d032c7..0c455af8d 100644
--- a/src/net/java/sip/communicator/service/protocol/media/DynamicPayloadTypeRegistry.java
+++ b/src/net/java/sip/communicator/service/protocol/media/DynamicPayloadTypeRegistry.java
@@ -243,7 +243,10 @@ public void addMapping(MediaFormat format, byte payloadType)
             if(alreadyMappedFmt.matches(format))
             {
                 //we already have the exact same mapping, so no need to
-                //create a new one override the old PT number.
+                //create a new one override the old PT number. However, there
+                //might be a leftover override from a previous mapping so let's
+                //remove it if this is the case.
+                payloadTypeOverrides.remove(payloadType);
                 return;
             }
             //else: