diff --git a/src/java/org/jivesoftware/openfire/net/SocketReadingMode.java b/src/java/org/jivesoftware/openfire/net/SocketReadingMode.java
index 34060c4f6a..ba5424f5fb 100644
--- a/src/java/org/jivesoftware/openfire/net/SocketReadingMode.java
+++ b/src/java/org/jivesoftware/openfire/net/SocketReadingMode.java
@@ -278,7 +278,7 @@ private String geStreamHeader() {
         sb.append("\" id=\"");
         sb.append(socketReader.session.getStreamID().toString());
         sb.append("\" xml:lang=\"");
-        sb.append(socketReader.session.getLanguage());
+        sb.append(socketReader.session.getLanguage().toLanguageTag());
         sb.append("\" version=\"");
         sb.append(Session.MAJOR_VERSION).append('.').append(Session.MINOR_VERSION);
         sb.append("\">");
diff --git a/src/java/org/jivesoftware/openfire/net/StanzaHandler.java b/src/java/org/jivesoftware/openfire/net/StanzaHandler.java
index 62be17b426..bf6ccaa8f0 100644
--- a/src/java/org/jivesoftware/openfire/net/StanzaHandler.java
+++ b/src/java/org/jivesoftware/openfire/net/StanzaHandler.java
@@ -580,7 +580,7 @@ private String geStreamHeader() {
         sb.append("\" id=\"");
         sb.append(session.getStreamID());
         sb.append("\" xml:lang=\"");
-        sb.append(session.getLanguage());
+        sb.append(session.getLanguage().toLanguageTag());
         sb.append("\" version=\"");
         sb.append(Session.MAJOR_VERSION).append('.').append(Session.MINOR_VERSION);
         sb.append("\">");
diff --git a/src/java/org/jivesoftware/openfire/session/LocalClientSession.java b/src/java/org/jivesoftware/openfire/session/LocalClientSession.java
index c79f6018e6..9fcc4a1b1f 100644
--- a/src/java/org/jivesoftware/openfire/session/LocalClientSession.java
+++ b/src/java/org/jivesoftware/openfire/session/LocalClientSession.java
@@ -347,7 +347,7 @@ else if (majorVersion == MAJOR_VERSION) {
         sb.append("\" id=\"");
         sb.append(session.getStreamID().toString());
         sb.append("\" xml:lang=\"");
-        sb.append(language);
+        sb.append(language.toLanguageTag());
         // Don't include version info if the version is 0.0.
         if (majorVersion != 0) {
             sb.append("\" version=\"");