diff --git a/lib/saml20.js b/lib/saml20.js
index 21c1f278..113ee80c 100644
--- a/lib/saml20.js
+++ b/lib/saml20.js
@@ -184,6 +184,14 @@ exports.create = function(options, callback) {
   if (options.nameIdentifierFormat) {
     nameID.setAttribute('Format', options.nameIdentifierFormat);
   }
+
+  if (options.nameIdentifierNameQualifier) {  
+    nameID.setAttribute('NameQualifier', options.nameIdentifierNameQualifier);
+  }
+  
+  if (options.nameIdentifierSPNameQualifier) {  
+    nameID.setAttribute('SPNameQualifier', options.nameIdentifierSPNameQualifier);
+  }
   
   if( options.authnContextClassRef ) {
     var authnCtxClassRef = doc.getElementsByTagName('saml:AuthnContextClassRef')[0];